2D shadow and 2D array uniforms got their own types

aras-p · Aug 28, 2015 · 40da708 · 40da708
1 parent bfa3868
commit 40da708
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 11 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,10 @@ GLSL optimizer Change Log
 2015 08
 -------
 
+Changes:
+
+* 2D shadow and 2D array uniforms got their own glslopt_basic_type entries.
+
 Fixes:
 
 * Fixed translation of 2D texture arrays (GLSL with EXT_texture_array, GLES3 and Metal).

diff --git a/src/glsl/glsl_optimizer.cpp b/src/glsl/glsl_optimizer.cpp
@@ -523,7 +523,14 @@ static void glsl_type_to_optimizer_desc(const glsl_type* type, glsl_precision pr
 	else if (type->is_sampler())
 	{
 		if (type->sampler_dimensionality == GLSL_SAMPLER_DIM_2D)
-			out->type = kGlslTypeTex2D;
+		{
+			if (type->sampler_shadow)
+				out->type = kGlslTypeTex2DShadow;
+			else if (type->sampler_array)
+				out->type = kGlslTypeTex2DArray;
+			else
+				out->type = kGlslTypeTex2D;
+		}
 		else if (type->sampler_dimensionality == GLSL_SAMPLER_DIM_3D)
 			out->type = kGlslTypeTex3D;
 		else if (type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE)

diff --git a/src/glsl/glsl_optimizer.h b/src/glsl/glsl_optimizer.h
@@ -51,6 +51,8 @@ enum glslopt_basic_type {
 	kGlslTypeTex2D,
 	kGlslTypeTex3D,
 	kGlslTypeTexCube,
+	kGlslTypeTex2DShadow,
+	kGlslTypeTex2DArray,
 	kGlslTypeOther,
 	kGlslTypeCount
 };

diff --git a/tests/fragment/tex2DArray-out.txt b/tests/fragment/tex2DArray-out.txt
@@ -11,4 +11,4 @@ void main ()
 // inputs: 1
 //  #0: uv (high float) 4x1 [-1]
 // textures: 1
-//  #0: myarr (high 2d) 0x0 [-1]
+//  #0: myarr (high 2darray) 0x0 [-1]
diff --git a/tests/fragment/tex2DArray-outES3.txt b/tests/fragment/tex2DArray-outES3.txt
@@ -30,4 +30,4 @@ void main ()
 // inputs: 1
 //  #0: uv (high float) 4x1 [-1]
 // textures: 1
-//  #0: myarr (low 2d) 0x0 [-1]
+//  #0: myarr (low 2darray) 0x0 [-1]
diff --git a/tests/fragment/tex2DArray-outES3Metal.txt b/tests/fragment/tex2DArray-outES3Metal.txt
@@ -39,4 +39,4 @@ fragment xlatMtlShaderOutput xlatMtlMain (xlatMtlShaderInput _mtl_i [[stage_in]]
 // inputs: 1
 //  #0: uv (high float) 4x1 [-1]
 // textures: 1
-//  #0: myarr (low 2d) 0x0 [-1] loc 0
+//  #0: myarr (low 2darray) 0x0 [-1] loc 0
diff --git a/tests/fragment/tex2dshadow-out.txt b/tests/fragment/tex2dshadow-out.txt
@@ -10,4 +10,4 @@ void main ()
 // inputs: 1
 //  #0: xlv_TEXCOORD0 (high float) 4x1 [-1]
 // textures: 1
-//  #0: shadowmap (high 2d) 0x0 [-1]
+//  #0: shadowmap (high 2dshadow) 0x0 [-1]
diff --git a/tests/fragment/tex2dshadow-outES.txt b/tests/fragment/tex2dshadow-outES.txt
@@ -13,4 +13,4 @@ void main ()
 // inputs: 1
 //  #0: xlv_TEXCOORD0 (high float) 4x1 [-1]
 // textures: 1
-//  #0: shadowmap (low 2d) 0x0 [-1]
+//  #0: shadowmap (low 2dshadow) 0x0 [-1]
diff --git a/tests/fragment/tex2dshadow-outES3.txt b/tests/fragment/tex2dshadow-outES3.txt
@@ -20,4 +20,4 @@ void main ()
 //  #0: uvHi (high float) 4x1 [-1]
 //  #1: uvMed (medium float) 4x1 [-1]
 // textures: 1
-//  #0: shadowmap (low 2d) 0x0 [-1]
+//  #0: shadowmap (low 2dshadow) 0x0 [-1]
diff --git a/tests/fragment/tex2dshadow-outES3Metal.txt b/tests/fragment/tex2dshadow-outES3Metal.txt
@@ -30,4 +30,4 @@ fragment xlatMtlShaderOutput xlatMtlMain (xlatMtlShaderInput _mtl_i [[stage_in]]
 //  #0: uvHi (high float) 4x1 [-1]
 //  #1: uvMed (medium float) 4x1 [-1]
 // textures: 1
-//  #0: shadowmap (low 2d) 0x0 [-1] loc 0
+//  #0: shadowmap (low 2dshadow) 0x0 [-1] loc 0
diff --git a/tests/fragment/texProj-outES.txt b/tests/fragment/texProj-outES.txt
@@ -38,4 +38,4 @@ void main ()
 //  #0: uv (high float) 4x1 [-1]
 // textures: 2
 //  #0: tex (low 2d) 0x0 [-1]
-//  #1: shadowmap (low 2d) 0x0 [-1]
+//  #1: shadowmap (low 2dshadow) 0x0 [-1]
diff --git a/tests/fragment/texProj-outES3.txt b/tests/fragment/texProj-outES3.txt
@@ -20,4 +20,4 @@ void main ()
 //  #0: uv (high float) 4x1 [-1]
 // textures: 2
 //  #0: tex (low 2d) 0x0 [-1]
-//  #1: shadowmap (low 2d) 0x0 [-1]
+//  #1: shadowmap (low 2dshadow) 0x0 [-1]
diff --git a/tests/fragment/texProj-outES3Metal.txt b/tests/fragment/texProj-outES3Metal.txt
@@ -30,4 +30,4 @@ fragment xlatMtlShaderOutput xlatMtlMain (xlatMtlShaderInput _mtl_i [[stage_in]]
 //  #0: uv (high float) 4x1 [-1]
 // textures: 2
 //  #0: tex (low 2d) 0x0 [-1] loc 0
-//  #1: shadowmap (low 2d) 0x0 [-1] loc 1
+//  #1: shadowmap (low 2dshadow) 0x0 [-1] loc 1