diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 381fe1f9edf..4045c86095b 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -531,10 +531,10 @@ struct brw_vs_prog_data { }; -/* Note: brw_vec4_gs_prog_data_compare() must be updated when adding fields to +/* Note: brw_gs_prog_data_compare() must be updated when adding fields to * this struct! */ -struct brw_vec4_gs_prog_data +struct brw_gs_prog_data { struct brw_vec4_prog_data base; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 3549d5d7865..91a24ee726a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -34,7 +34,7 @@ const unsigned MAX_GS_INPUT_VERTICES = 6; namespace brw { vec4_gs_visitor::vec4_gs_visitor(struct brw_context *brw, - struct brw_vec4_gs_compile *c, + struct brw_gs_compile *c, struct gl_shader_program *prog, struct brw_shader *shader, void *mem_ctx) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h index e998666a6b4..87b58ab9bf5 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h @@ -33,7 +33,7 @@ #include "brw_vec4.h" -struct brw_vec4_gs_prog_key +struct brw_gs_prog_key { struct brw_vec4_prog_key base; @@ -44,11 +44,11 @@ struct brw_vec4_gs_prog_key /** * Scratch data used when compiling a GLSL geometry shader. */ -struct brw_vec4_gs_compile +struct brw_gs_compile { struct brw_vec4_compile base; - struct brw_vec4_gs_prog_key key; - struct brw_vec4_gs_prog_data prog_data; + struct brw_gs_prog_key key; + struct brw_gs_prog_data prog_data; struct brw_geometry_program *gp; }; @@ -61,7 +61,7 @@ class vec4_gs_visitor : public vec4_visitor { public: vec4_gs_visitor(struct brw_context *brw, - struct brw_vec4_gs_compile *c, + struct brw_gs_compile *c, struct gl_shader_program *prog, struct brw_shader *shader, void *mem_ctx); @@ -82,7 +82,7 @@ private: int setup_varying_inputs(int payload_reg, int *attribute_map); src_reg vertex_count; - const struct brw_vec4_gs_compile * const c; + const struct brw_gs_compile * const c; }; } /* namespace brw */ |