Merge pull request #1243 from danieldresser-ie/sampler1d

johnhaddon · web-flow · commit f37d2e4723b1 · 2022-02-28T14:11:42.000Z
IECoreGL::Shader : Support 1D samplers
diff --git a/src/IECoreGL/Shader.cpp b/src/IECoreGL/Shader.cpp
@@ -181,7 +181,7 @@ class Shader::Implementation : public IECore::RefCounted
 						}
 					}
 
-					if( p.type == GL_SAMPLER_2D || p.type == GL_SAMPLER_3D )
+					if( p.type == GL_SAMPLER_1D || p.type == GL_SAMPLER_2D || p.type == GL_SAMPLER_3D )
 					{
 						// we assign a specific texture unit to each individual
 						// sampler parameter - this makes it much easier to save

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ class Shader::Implementation : public IECore::RefCounted`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`- if( p.type == GL_SAMPLER_2D \|\| p.type == GL_SAMPLER_3D )`
	`184`	`+ if( p.type == GL_SAMPLER_1D \|\| p.type == GL_SAMPLER_2D \|\| p.type == GL_SAMPLER_3D )`
`185`	`185`	`{`
`186`	`186`	`// we assign a specific texture unit to each individual`
`187`	`187`	`// sampler parameter - this makes it much easier to save`