diff options
| author | Mark Janes <mark.a.janes@intel.com> | 2017-04-03 14:18:43 -0700 |
|---|---|---|
| committer | Mark Janes <mark.a.janes@intel.com> | 2017-06-19 14:04:51 -0700 |
| commit | c49e091b8949520b01c9d174dafb2f0121896c3f (patch) | |
| tree | dacc19390c13a035afd6e6e11493197501c449c6 | |
| parent | af16a54fe16978ae50bd2273bd1bf7dcb26a106c (diff) | |
Uniforms: support additional uniform types
Required by Unity Matinee trace.
| -rw-r--r-- | retrace/daemon/glframe_uniforms.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/retrace/daemon/glframe_uniforms.cpp b/retrace/daemon/glframe_uniforms.cpp index a816b4b6..fa813a3a 100644 --- a/retrace/daemon/glframe_uniforms.cpp +++ b/retrace/daemon/glframe_uniforms.cpp @@ -239,21 +239,35 @@ Uniform::Uniform(int i) { is_float = true; m_data_size = 12 * sizeof(GLfloat); break; + case GL_INT_SAMPLER_2D: + case GL_INT_SAMPLER_2D_ARRAY: + case GL_INT_SAMPLER_3D: + case GL_INT_SAMPLER_CUBE: case GL_SAMPLER_2D: - case GL_SAMPLER_CUBE: - case GL_SAMPLER_2D_SHADOW: case GL_SAMPLER_2D_ARRAY: case GL_SAMPLER_2D_ARRAY_SHADOW: - case GL_SAMPLER_CUBE_SHADOW: - case GL_INT_SAMPLER_2D: - case GL_INT_SAMPLER_3D: + case GL_SAMPLER_2D_SHADOW: case GL_SAMPLER_3D: - case GL_INT_SAMPLER_CUBE: - case GL_INT_SAMPLER_2D_ARRAY: + case GL_SAMPLER_BUFFER: + case GL_SAMPLER_CUBE: + case GL_SAMPLER_CUBE_SHADOW: case GL_UNSIGNED_INT_SAMPLER_2D: + case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: case GL_UNSIGNED_INT_SAMPLER_3D: case GL_UNSIGNED_INT_SAMPLER_CUBE: - case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: + case GL_SAMPLER_CUBE_MAP_ARRAY: + case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW: + case GL_INT_SAMPLER_CUBE_MAP_ARRAY: + case GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY: + case GL_IMAGE_CUBE_MAP_ARRAY: + case GL_INT_IMAGE_CUBE_MAP_ARRAY: + case GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY: + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY: + case GL_SAMPLER_2D_MULTISAMPLE_ARRAY: + case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: + case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: + case GL_SAMPLER_2D_RECT_ARB: m_dataType = k_sampler; is_float = false; m_data_size = 1 * sizeof(GLint); |