P4 to Git Change 1094113 by gandryey@gera-dev-w7 on 2014/11/05 18:22:34

ECR #304775 - CL-GL depth buffer interop
	- Make the changes necessary for the depth buffer interop support. Currently the extension is disabled, because the conformance tests have multiple bugs.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_memobj.cpp#71 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#231 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#197 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#292 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#101 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#113 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#217 edit

rocclr/runtime/platform/memory.cpp

@@ -1102,11 +1102,11 @@ Image::getSupportedFormats(
 bool
 Image::Format::isSupported(const Context& context, cl_mem_object_type image_type) const
 {
-    bool supportDepthMSAA = true;
+    bool supportDepth = true;
     const std::vector<amd::Device*>& devices = context.devices();
     for (size_t i = 0; i < devices.size(); i++) {
-        if (!devices[i]->settings().depthMSAAInterop_) {
-            supportDepthMSAA = false;
+        if (!devices[i]->settings().checkExtension(ClKhrGLDepthImages)) {
+            supportDepth = false;
         }
     }
 
@@ -1129,7 +1129,7 @@ Image::Format::isSupported(const Context& context, cl_mem_object_type image_type
 
     delete image_formats;
 
-    if (supportDepthMSAA) {
+    if (supportDepth) {
         for (cl_uint i = 0; i < sizeof(depthFormats) / sizeof(cl_image_format); i++) {
             if (*this == depthFormats[i]) {
                return true;