Write only texture types. (#5454)

* Add support for write-only textures. * Fix capabilities. * Fix implementation. * Fix. * format code --------- Co-authored-by: Ellie Hermaszewska <[email protected]> Co-authored-by: slangbot <[email protected]>
shader-slang · Oct 30, 2024 · 28f20f4 · 28f20f4
1 parent feec3cf
commit 28f20f4
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 102 deletions.
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
diff --git a/source/slang/slang-ast-type.cpp b/source/slang/slang-ast-type.cpp
@@ -1132,6 +1132,7 @@ SlangResourceAccess ResourceType::getAccess()
         {
         case kCoreModule_ResourceAccessReadOnly:  return SLANG_RESOURCE_ACCESS_READ;
         case kCoreModule_ResourceAccessReadWrite: return SLANG_RESOURCE_ACCESS_READ_WRITE;
+        case kCoreModule_ResourceAccessWriteOnly: return SLANG_RESOURCE_ACCESS_WRITE;
         case kCoreModule_ResourceAccessRasterizerOrdered:
             return SLANG_RESOURCE_ACCESS_RASTER_ORDERED;
         case kCoreModule_ResourceAccessFeedback: return SLANG_RESOURCE_ACCESS_FEEDBACK;

diff --git a/source/slang/slang-capabilities.capdef b/source/slang/slang-capabilities.capdef
@@ -1757,11 +1757,11 @@ alias getattributeatvertex = fragment + _sm_6_1 | fragment + GL_EXT_fragment_sha
 alias memorybarrier = sm_5_0_version;
 /// Capabilities required to use sm_4_0 texture operations
 /// [Compound]
-alias texture_sm_4_0 = sm_4_0_version | GL_ARB_sparse_texture_clamp + GL_EXT_texture_query_lod
+alias texture_sm_4_0 = sm_4_0_version
                      ;
 /// Capabilities required to use sm_4_1 texture operations
 /// [Compound]
-alias texture_sm_4_1 = sm_4_1_version | GL_ARB_sparse_texture_clamp + GL_EXT_texture_query_lod
+alias texture_sm_4_1 = sm_4_1_version
                      ;
 /// Capabilities required to use sm_4_1 samplerless texture operations
 /// [Compound]

diff --git a/source/slang/slang-core-module-textures.cpp b/source/slang/slang-core-module-textures.cpp
@@ -102,7 +102,8 @@ void TextureTypeInfo::writeFuncBody(
         if (spirvDefault.getLength() && spirvCombined.getLength())
         {
             sb << i << "case spirv:\n";
-            sb << i << "if (access == " << kCoreModule_ResourceAccessReadWrite << ")\n";
+            sb << i << "if (access == " << kCoreModule_ResourceAccessReadWrite
+               << " || access == " << kCoreModule_ResourceAccessWriteOnly << ")\n";
             sb << i << "return spirv_asm\n";
             {
                 BraceScope spirvRWScope{i, sb, ";\n"};

diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
@@ -130,6 +130,7 @@ SlangResult CPPSourceEmitter::_calcCPPTextureTypeName(
     switch (texType->getAccess())
     {
     case SLANG_RESOURCE_ACCESS_READ:           break;
+    case SLANG_RESOURCE_ACCESS_WRITE:          outName << "RW"; break;
     case SLANG_RESOURCE_ACCESS_READ_WRITE:     outName << "RW"; break;
     case SLANG_RESOURCE_ACCESS_RASTER_ORDERED: outName << "RasterizerOrdered"; break;
     case SLANG_RESOURCE_ACCESS_APPEND:         outName << "Append"; break;

diff --git a/source/slang/slang-emit-cuda.cpp b/source/slang/slang-emit-cuda.cpp
@@ -130,6 +130,8 @@ SlangResult CUDASourceEmitter::_calcCUDATextureTypeName(
             return SLANG_OK;
         }
     case SLANG_RESOURCE_ACCESS_READ_WRITE:
+    case SLANG_RESOURCE_ACCESS_RASTER_ORDERED:
+    case SLANG_RESOURCE_ACCESS_WRITE:
         {
             outName << "CUsurfObject";
             return SLANG_OK;

diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp
@@ -1500,6 +1500,7 @@ void GLSLSourceEmitter::emitImageFormatModifierImpl(IRInst* varDecl, IRType* var
     {
         switch (resourceType->getAccess())
         {
+        case SLANG_RESOURCE_ACCESS_WRITE:
         case SLANG_RESOURCE_ACCESS_READ_WRITE:
         case SLANG_RESOURCE_ACCESS_RASTER_ORDERED:
             {
@@ -2939,6 +2940,7 @@ void GLSLSourceEmitter::emitSimpleTypeImpl(IRType* type)
         }
         switch (texType->getAccess())
         {
+        case SLANG_RESOURCE_ACCESS_WRITE:
         case SLANG_RESOURCE_ACCESS_READ_WRITE:
         case SLANG_RESOURCE_ACCESS_RASTER_ORDERED:
             _emitGLSLTextureOrTextureSamplerType(texType, "image");

diff --git a/source/slang/slang-emit-hlsl.cpp b/source/slang/slang-emit-hlsl.cpp
@@ -278,6 +278,8 @@ void HLSLSourceEmitter::_emitHLSLTextureType(IRTextureTypeBase* texType)
 
     case SLANG_RESOURCE_ACCESS_READ_WRITE: m_writer->emit("RW"); break;
 
+    case SLANG_RESOURCE_ACCESS_WRITE: m_writer->emit("RW"); break;
+
     case SLANG_RESOURCE_ACCESS_RASTER_ORDERED: m_writer->emit("RasterizerOrdered"); break;
 
     case SLANG_RESOURCE_ACCESS_APPEND: m_writer->emit("Append"); break;

diff --git a/source/slang/slang-emit-metal.cpp b/source/slang/slang-emit-metal.cpp
@@ -125,6 +125,8 @@ void MetalSourceEmitter::_emitHLSLTextureType(IRTextureTypeBase* texType)
     {
     case SLANG_RESOURCE_ACCESS_READ: m_writer->emit("access::sample"); break;
 
+    case SLANG_RESOURCE_ACCESS_WRITE: m_writer->emit("access::write"); break;
+
     case SLANG_RESOURCE_ACCESS_READ_WRITE:
     case SLANG_RESOURCE_ACCESS_APPEND:
     case SLANG_RESOURCE_ACCESS_CONSUME:

diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp
@@ -2068,6 +2068,7 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
         {
         case SlangResourceAccess::SLANG_RESOURCE_ACCESS_READ_WRITE:
         case SlangResourceAccess::SLANG_RESOURCE_ACCESS_RASTER_ORDERED:
+        case SlangResourceAccess::SLANG_RESOURCE_ACCESS_WRITE:
             sampled = ImageOpConstants::readWriteImage;
             break;
         case SlangResourceAccess::SLANG_RESOURCE_ACCESS_NONE:

diff --git a/source/slang/slang-emit-wgsl.cpp b/source/slang/slang-emit-wgsl.cpp
@@ -405,6 +405,7 @@ void WGSLSourceEmitter::emitSimpleTypeImpl(IRType* type)
         {
             switch (texType->getAccess())
             {
+            case SLANG_RESOURCE_ACCESS_WRITE:
             case SLANG_RESOURCE_ACCESS_READ_WRITE: m_writer->emit("texture_storage"); break;
             default:                               m_writer->emit("texture"); break;
             }
@@ -442,7 +443,10 @@ void WGSLSourceEmitter::emitSimpleTypeImpl(IRType* type)
                     m_writer->emit(getWgslImageFormat(texType));
                     m_writer->emit(", read_write");
                     break;
-
+                case SLANG_RESOURCE_ACCESS_WRITE:
+                    m_writer->emit(getWgslImageFormat(texType));
+                    m_writer->emit(", write");
+                    break;
                 default:
                     if (auto vecElemType = as<IRVectorType>(elemType))
                         emitSimpleType(vecElemType->getElementType());

diff --git a/source/slang/slang-ir-specialize-resources.cpp b/source/slang/slang-ir-specialize-resources.cpp
@@ -1315,6 +1315,7 @@ bool isIllegalGLSLParameterType(IRType* type)
         switch (texType->getAccess())
         {
         case SLANG_RESOURCE_ACCESS_READ_WRITE:
+        case SLANG_RESOURCE_ACCESS_WRITE:
         case SLANG_RESOURCE_ACCESS_RASTER_ORDERED: return true;
         default:                                   break;
         }

diff --git a/source/slang/slang-ir.h b/source/slang/slang-ir.h
@@ -1437,8 +1437,9 @@ struct IRResourceTypeBase : IRType
             case kCoreModule_ResourceAccessReadWrite: return SLANG_RESOURCE_ACCESS_READ_WRITE;
             case kCoreModule_ResourceAccessRasterizerOrdered:
                 return SLANG_RESOURCE_ACCESS_RASTER_ORDERED;
-            case kCoreModule_ResourceAccessFeedback: return SLANG_RESOURCE_ACCESS_FEEDBACK;
-            default:                                 break;
+            case kCoreModule_ResourceAccessFeedback:  return SLANG_RESOURCE_ACCESS_FEEDBACK;
+            case kCoreModule_ResourceAccessWriteOnly: return SLANG_RESOURCE_ACCESS_WRITE;
+            default:                                  break;
             }
         }
         return SLANG_RESOURCE_ACCESS_UNKNOWN;

diff --git a/source/slang/slang-type-system-shared.h b/source/slang/slang-type-system-shared.h
@@ -41,8 +41,9 @@ enum class SamplerStateFlavor : uint8_t
 
 const int kCoreModule_ResourceAccessReadOnly = 0;
 const int kCoreModule_ResourceAccessReadWrite = 1;
-const int kCoreModule_ResourceAccessRasterizerOrdered = 2;
-const int kCoreModule_ResourceAccessFeedback = 3;
+const int kCoreModule_ResourceAccessWriteOnly = 2;
+const int kCoreModule_ResourceAccessRasterizerOrdered = 3;
+const int kCoreModule_ResourceAccessFeedback = 4;
 
 const int kCoreModule_ShapeIndex1D = 0;
 const int kCoreModule_ShapeIndex2D = 1;

diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
@@ -1984,7 +1984,9 @@ CapabilitySet TargetRequest::getTargetCaps()
     case CodeGenTarget::MetalLib:
     case CodeGenTarget::MetalLibAssembly: atoms.add(CapabilityName::metal); break;
 
-    case CodeGenTarget::WGSL: atoms.add(CapabilityName::wgsl); break;
+    case CodeGenTarget::WGSLSPIRV:
+    case CodeGenTarget::WGSLSPIRVAssembly:
+    case CodeGenTarget::WGSL:              atoms.add(CapabilityName::wgsl); break;
 
     default: break;
     }

diff --git a/tests/wgsl/write-only-texture.slang b/tests/wgsl/write-only-texture.slang
@@ -0,0 +1,24 @@
+//TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target wgsl -no-codegen
+//TEST:SIMPLE(filecheck=SPV): -target spirv
+//TEST:SIMPLE(filecheck=CHECK): -target wgsl -entry computeMain -stage compute
+//TEST:SIMPLE(filecheck=CHECK-WGSL-SPV): -target wgsl-spirv-asm -entry computeMain -stage compute
+//TEST:SIMPLE(filecheck=HLSL): -target hlsl -entry computeMain -profile cs_6_0
+//TEST:SIMPLE(filecheck=GLSL): -target glsl -entry computeMain -stage compute
+
+// CHECK: texture_storage_2d<rgba8unorm, write>
+// CHECK-WGSL-SPV: OpTypeImage %float 2D {{.}} 0 0 2 Rgba8
+// SPV: OpTypeImage %float 2D {{.}} 0 0 2 Rgba8
+// HLSL: RWTexture2D
+// GLSL: image2D
+
+// REFLECT: "name": "writeOnlyTexture"
+// REFLECT: "access": "write"
+
+[format("rgba8")]
+WTexture2D writeOnlyTexture;
+
+[shader("compute")]
+void computeMain()
+{
+    writeOnlyTexture.Store(int2(0,0), float4(0.2, 0.3, 0.4, 1.0));
+}