summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderapi.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-11-22 23:31:08 +1100
committerTimothy Arceri <[email protected]>2017-01-23 14:48:04 +1100
commit79f07e87c9f197ca9e231bb2b78149ac6ff1f44b (patch)
treeb7773c16b77e9264e395cb11d24c6d032a5631d8 /src/mesa/main/shaderapi.c
parentb96bddae678d686dfd22deb40adb093ec4691f53 (diff)
mesa/glsl: set and get cs layouts to and from shader_info
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
-rw-r--r--src/mesa/main/shaderapi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index a550e6ff1ed..3313fa215b3 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -807,7 +807,8 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
return;
}
for (i = 0; i < 3; i++)
- params[i] = shProg->Comp.LocalSize[i];
+ params[i] = shProg->_LinkedShaders[MESA_SHADER_COMPUTE]->
+ Program->info.cs.local_size[i];
return;
}
case GL_PROGRAM_SEPARABLE:
@@ -2213,10 +2214,7 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
break;
}
case MESA_SHADER_COMPUTE: {
- for (int i = 0; i < 3; i++)
- dst->info.cs.local_size[i] = src->Comp.LocalSize[i];
dst->info.cs.shared_size = src->Comp.SharedSize;
- dst->info.cs.local_size_variable = src->Comp.LocalSizeVariable;
break;
}
default: