P4 to Git Change 1261640 by gandryey@gera-w8 on 2016/04/25 18:21:12

SWDEV-90482 - [Afterswitch] Interop from OpenGL to OpenCL is broken in one driver and crashes in another
	- Make sure SRD resource is reported to OS if program contains static samplers

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#314 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#67 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#4 edit

rocclr/runtime/device/gpu/gpukernel.cpp

@@ -4017,7 +4017,7 @@ HSAILKernel::loadArguments(
         memList.push_back(gpu.hsaQueueMem());
     }
 
-    if (srdResource) {
+    if (srdResource || prog().isStaticSampler()) {
         dev().srds().fillResourceList(memList);
     }