summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderapi.c
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-11-22 21:45:16 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2017-01-23 14:48:04 +1100
commitb96bddae678d686dfd22deb40adb093ec4691f53 (patch)
tree21df0a7452b0561c73007180a6047e33f4ab6d72 /src/mesa/main/shaderapi.c
parentcbeba6bd48da2cbe0074cc59a857e0248e94b8fe (diff)
mesa/glsl: set and get gs layouts directly to and from shader_info
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
-rw-r--r--src/mesa/main/shaderapi.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 5c9b06fdc66..a550e6ff1ed 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -719,7 +719,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
- info.Geom.VerticesOut;
+ Program->info.gs.vertices_out;
}
return;
case GL_GEOMETRY_SHADER_INVOCATIONS:
@@ -727,7 +727,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
- info.Geom.Invocations;
+ Program->info.gs.invocations;
}
return;
case GL_GEOMETRY_INPUT_TYPE:
@@ -735,7 +735,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
- info.Geom.InputType;
+ Program->info.gs.input_primitive;
}
return;
case GL_GEOMETRY_OUTPUT_TYPE:
@@ -743,7 +743,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
- info.Geom.OutputType;
+ Program->info.gs.output_primitive;
}
return;
case GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH: {
@@ -2204,10 +2204,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
switch (dst_sh->Stage) {
case MESA_SHADER_GEOMETRY: {
dst->info.gs.vertices_in = src->Geom.VerticesIn;
- dst->info.gs.vertices_out = dst_sh->info.Geom.VerticesOut;
- dst->info.gs.invocations = dst_sh->info.Geom.Invocations;
- dst->info.gs.input_primitive = dst_sh->info.Geom.InputType;
- dst->info.gs.output_primitive = dst_sh->info.Geom.OutputType;
dst->info.gs.uses_end_primitive = src->Geom.UsesEndPrimitive;
dst->info.gs.uses_streams = src->Geom.UsesStreams;
break;