Remove CompressedImage2D GPUData in favor Image2D

Both are having the exact same layout and semantic from a GPU
perspective, there is no need to separate them.

Author: tarcila

devices/rtx/gpu/evalMaterial.h

@@ -278,11 +278,6 @@ VISRTX_DEVICE vec4 evaluateImageTextureSampler(
     retval = make_vec4(tex1D<::float4>(sampler.image1D.texobj, tc.x));
     break;
   }
-  case SamplerType::COMPRESSED_TEXTURE2D: {
-    retval = make_vec4(
-        tex2D<::float4>(sampler.compressedImage2D.texobj, tc.x, tc.y));
-    break;
-  }
   case SamplerType::TEXTURE2D: {
     retval = make_vec4(tex2D<::float4>(sampler.image2D.texobj, tc.x, tc.y));
     break;
@@ -308,11 +303,6 @@ VISRTX_DEVICE vec4 evaluateImageTexelSampler(
     retval = make_vec4(tex1D<::float4>(sampler.image1D.texelTexobj, tc.x));
     break;
   }
-  case SamplerType::COMPRESSED_TEXTURE2D: {
-    retval = make_vec4(
-        tex2D<::float4>(sampler.compressedImage2D.texelTexobj, tc.x, tc.y));
-    break;
-  }
   case SamplerType::TEXTURE2D: {
     retval =
         make_vec4(tex2D<::float4>(sampler.image2D.texelTexobj, tc.x, tc.y));
@@ -342,12 +332,6 @@ VISRTX_DEVICE vec4 evaluateSampler(
     retval = make_vec4(tex1D<::float4>(sampler.image1D.texobj, tc.x));
     break;
   }
-  case SamplerType::COMPRESSED_TEXTURE2D: {
-    retval = make_vec4(
-        tex2D<::float4>(sampler.compressedImage2D.texobj, tc.x, tc.y));
-
-    break;
-  }
   case SamplerType::TEXTURE2D: {
     retval = make_vec4(tex2D<::float4>(sampler.image2D.texobj, tc.x, tc.y));
     break;

devices/rtx/gpu/gpu_objects.h

@@ -195,7 +195,6 @@ struct GeometryGPUData
 
 enum class SamplerType
 {
-  COMPRESSED_TEXTURE2D,
   TEXTURE1D,
   TEXTURE2D,
   TEXTURE3D,
@@ -228,14 +227,6 @@ struct Image3DData
   vec3 invSize;
 };
 
-struct CompressedImage2DData
-{
-  cudaTextureObject_t texobj;
-  cudaTextureObject_t texelTexobj;
-  uvec2 size;
-  vec2 invSize;
-};
-
 struct PrimIDSamplerData
 {
   AttributeData attr;
@@ -252,7 +243,6 @@ struct SamplerGPUData
   vec4 outOffset;
   union
   {
-    CompressedImage2DData compressedImage2D;
     Image1DData image1D;
     Image2DData image2D;
     Image3DData image3D;

devices/rtx/scene/surface/material/sampler/CompressedImage2D.cpp

@@ -172,11 +172,11 @@ int CompressedImage2D::numChannels() const
 SamplerGPUData CompressedImage2D::gpuData() const
 {
   SamplerGPUData retval = Sampler::gpuData();
-  retval.type = SamplerType::COMPRESSED_TEXTURE2D;
-  retval.compressedImage2D.texobj = m_texture;
-  retval.compressedImage2D.texelTexobj = m_texels;
-  retval.compressedImage2D.size = m_size;
-  retval.compressedImage2D.invSize =
+  retval.type = SamplerType::TEXTURE2D;
+  retval.image2D.texobj = m_texture;
+  retval.image2D.texelTexobj = m_texels;
+  retval.image2D.size = m_size;
+  retval.image2D.invSize =
       glm::vec2(1.0f / m_size.x, 1.0f / m_size.y);
 
   return retval;