Fixed another Push-Constants bug... CC: @Crisspl

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raygen.comp

@@ -221,12 +221,12 @@ void main()
 			const uint realOutputID = outputID+i;
 			if (validRay)
 			{
-				throughput /= float(staticViewData.samplesPerPixelPerDispatch);
+				throughput.rgb /= float(staticViewData.samplesPerPixelPerDispatch);
 
 				const float tt = 1.0;
-				rays[realOutputID].origin = nbl_glsl_MC_getWorldSpacePosition()+nbl_glsl_MC_getNormalizedWorldSpaceV()*tt;//-direction*0.5*maxT;/*+newray.direction*err?; TODO */
-				rays[realOutputID].maxT = tt*2.0;
-				rays[realOutputID].direction = -nbl_glsl_MC_getNormalizedWorldSpaceV()*tt;
+				rays[realOutputID].origin = pc.cummon.cameraPosition;//nbl_glsl_MC_getWorldSpacePosition()+nbl_glsl_MC_getNormalizedWorldSpaceV()*tt;//-direction*0.5*maxT;/*+newray.direction*err?; TODO */
+				rays[realOutputID].maxT = FLT_MAX;//tt*2.0;
+				rays[realOutputID].direction = -nbl_glsl_MC_getNormalizedWorldSpaceV();
 				rays[realOutputID].mask = -1;
 				rays[realOutputID]._active = 1;
 				rays[realOutputID].backfaceCulling = int(packHalf2x16(throughput.ab));

examples_tests/22.RaytracedAO/resolve.comp

@@ -29,8 +29,8 @@ void main()
 			if (hit.shapeid<0)
 				continue;
 
-			//color.r -= float(hit.shapeid);//staticViewData.samplesPerPixelPerDispatch;
-			//color.g -= float(hit.primid);//staticViewData.samplesPerPixelPerDispatch;
+			color.r -= float(hit.shapeid);//staticViewData.samplesPerPixelPerDispatch;
+			color.g -= float(hit.primid);//staticViewData.samplesPerPixelPerDispatch;
 
 			// hit buffer needs clearing
 			hits[rayID].shapeid = -1;

src/nbl/video/IOpenGLPipeline.h

@@ -99,9 +99,8 @@ class IOpenGLPipeline
 		        {
 			        // pack the constant data as OpenGL uniform update functions expect packed arrays
 			        {
-				        const bool isRowMajor = is_scalar_or_vec() || m.rowMajor;
-                        const uint32_t rowOrColCnt = isRowMajor ? m.mtxRowCnt : m.mtxColCnt;
-				        const uint32_t len = isRowMajor ? m.mtxColCnt : m.mtxRowCnt;
+                        const uint32_t rowOrColCnt = m.rowMajor ? m.mtxRowCnt : m.mtxColCnt;
+				        const uint32_t len = m.rowMajor ? m.mtxColCnt : m.mtxRowCnt;
 				        for (uint32_t i = 0u; i < count; ++i)
 				        for (uint32_t c = 0u; c < rowOrColCnt; ++c)
 				        {