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 [ROCm/clr commit: c484ae9061]
2016-04-25 18:36:37 -04:00
parent cdcb59d5ef
commit 74523f0003
4 changed files with 8 additions and 2 deletions
@@ -4017,7 +4017,7 @@ HSAILKernel::loadArguments(
        memList.push_back(gpu.hsaQueueMem());
    }

-    if (srdResource) {
+    if (srdResource || prog().isStaticSampler()) {
        dev().srds().fillResourceList(memList);
    }

@@ -528,6 +528,9 @@ public:
    //! Returns TRUE if the program just compiled
    bool isNull() const { return isNull_; }

+    //! Returns TRUE if the program contains static samplers
+    bool isStaticSampler() const { return (staticSamplers_.size() != 0); }
+
 protected:
    //! pre-compile setup for GPU
    virtual bool initBuild(amd::option::Options* options);
@@ -1192,7 +1192,7 @@ HSAILKernel::loadArguments(
        memList.push_back(gpu.hsaQueueMem());
    }

-    if (srdResource) {
+    if (srdResource || prog().isStaticSampler()) {
        dev().srds().fillResourceList(memList);
    }

@@ -193,6 +193,9 @@ public:
    //! Returns TRUE if the program just compiled
    bool isNull() const { return isNull_; }

+    //! Returns TRUE if the program contains static samplers
+    bool isStaticSampler() const { return (staticSamplers_.size() != 0); }
+
 protected:
    //! pre-compile setup for GPU
    virtual bool initBuild(amd::option::Options* options);