3D texture support in GLES30 -- Mikko Strandborg

aras-p · Aug 25, 2015 · 97e6b5c · 97e6b5c
1 parent d8f33cc
commit 97e6b5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/hlslang/GLSLCodeGen/glslOutput.cpp b/hlslang/GLSLCodeGen/glslOutput.cpp
@@ -1643,7 +1643,13 @@ bool TGlslOutputTraverser::traverseAggregate( bool preVisit, TIntermAggregate *n
 
    case EOpTex3D:
       if (argCount == 2)
-         writeTex( "texture3D", node, goit);
+      {
+         if (usePost120TextureLookups) {
+            writeTex( "texture", node, goit);
+         } else {
+            writeTex( "texture3D", node, goit);
+         }
+      }
       else
       {
          current->addLibFunction(EOpTex3DGrad);

diff --git a/hlslang/MachineIndependent/hlslang.y b/hlslang/MachineIndependent/hlslang.y
@@ -1827,7 +1827,7 @@ type_specifier_nonarray
 		SET_BASIC_TYPE($$,$1,EbtSampler2D,EbpHigh);
 	}
     | SAMPLER3D {
-        SET_BASIC_TYPE($$,$1,EbtSampler3D,EbpUndefined);
+        SET_BASIC_TYPE($$,$1,EbtSampler3D,EbpLow);
     } 
     | SAMPLERCUBE {
         SET_BASIC_TYPE($$,$1,EbtSamplerCube,EbpUndefined);