Module: Mesa
Branch: master
Commit: 56a2e57bdb98a7fb4f1f404cbae1b9b396eee0de
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=56a2e57bdb98a7fb4f1f404cbae1b9b396eee0de
Author: Paul Berry <stereotype...@gmail.com>
Date: Fri Aug 23 21:49:50 2013 -0700
i965: Rename user-defined gs structs from vec4_gs to gs.
Now that the name "gs" is no longer used to refer to the legacy fixed
function geometry shaders, we can use it to refer to user-defined
geometry shaders.
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Chad Versace <chad.vers...@linux.intel.com>
---
src/mesa/drivers/dri/i965/brw_context.h | 4 ++--
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 2 +-
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 381fe1f..4045c86 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 3549d5d..91a24ee 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 e998666..87b58ab 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 */
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
