[Mesa-dev] [PATCH 21/25] i965: replace brw_vertex_program with new generic brw_program
Timothy Arceri
timothy.arceri at collabora.com
Tue Oct 18 06:12:24 UTC 2016
---
src/mesa/drivers/dri/i965/brw_context.h | 17 +++++++++--------
src/mesa/drivers/dri/i965/brw_program.c | 8 ++++----
src/mesa/drivers/dri/i965/brw_vs.c | 10 ++++------
src/mesa/drivers/dri/i965/brw_vs.h | 2 +-
src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 3 +--
src/mesa/drivers/dri/i965/gen6_vs_state.c | 3 +--
6 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index ecbd7d0..e6a290e 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -326,8 +326,9 @@ struct brw_state_flags {
uint64_t brw;
};
-/** Subclass of Mesa vertex program */
-struct brw_vertex_program {
+
+/** Subclass of Mesa program */
+struct brw_program {
struct gl_program program;
GLuint id;
};
@@ -1698,16 +1699,16 @@ brw_context( struct gl_context *ctx )
return (struct brw_context *)ctx;
}
-static inline struct brw_vertex_program *
-brw_vertex_program(struct gl_program *p)
+static inline struct brw_program *
+brw_program(struct gl_program *p)
{
- return (struct brw_vertex_program *) p;
+ return (struct brw_program *) p;
}
-static inline const struct brw_vertex_program *
-brw_vertex_program_const(const struct gl_program *p)
+static inline const struct brw_program *
+brw_program_const(const struct gl_program *p)
{
- return (const struct brw_vertex_program *) p;
+ return (const struct brw_program *) p;
}
static inline struct brw_tess_ctrl_program *
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 3a91349..9937fac 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -131,7 +131,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
switch (target) {
case GL_VERTEX_PROGRAM_ARB: {
- struct brw_vertex_program *prog = CALLOC_STRUCT(brw_vertex_program);
+ struct brw_program *prog = CALLOC_STRUCT(brw_program);
if (prog) {
prog->id = get_new_program_id(brw->screen);
@@ -242,9 +242,9 @@ brwProgramStringNotify(struct gl_context *ctx,
break;
}
case GL_VERTEX_PROGRAM_ARB: {
- struct brw_vertex_program *newVP = brw_vertex_program(prog);
- const struct brw_vertex_program *curVP =
- brw_vertex_program_const(brw->vertex_program);
+ struct brw_program *newVP = brw_program(prog);
+ const struct brw_program *curVP =
+ brw_program_const(brw->vertex_program);
if (newVP == curVP)
brw->ctx.NewDriverState |= BRW_NEW_VERTEX_PROGRAM;
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index 5d1c8e0..842c516 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -87,7 +87,7 @@ brw_vs_outputs_written(struct brw_context *brw, struct brw_vs_prog_key *key,
bool
brw_codegen_vs_prog(struct brw_context *brw,
struct gl_shader_program *prog,
- struct brw_vertex_program *vp,
+ struct brw_program *vp,
struct brw_vs_prog_key *key)
{
const struct brw_compiler *compiler = brw->screen->compiler;
@@ -307,8 +307,7 @@ brw_vs_populate_key(struct brw_context *brw,
{
struct gl_context *ctx = &brw->ctx;
/* BRW_NEW_VERTEX_PROGRAM */
- struct brw_vertex_program *vp =
- (struct brw_vertex_program *)brw->vertex_program;
+ struct brw_program *vp = (struct brw_program *)brw->vertex_program;
struct gl_program *prog = (struct gl_program *) brw->vertex_program;
memset(key, 0, sizeof(*key));
@@ -360,8 +359,7 @@ brw_upload_vs_prog(struct brw_context *brw)
struct gl_shader_program **current = ctx->_Shader->CurrentProgram;
struct brw_vs_prog_key key;
/* BRW_NEW_VERTEX_PROGRAM */
- struct brw_vertex_program *vp =
- (struct brw_vertex_program *)brw->vertex_program;
+ struct brw_program *vp = (struct brw_program *)brw->vertex_program;
if (!brw_vs_state_dirty(brw))
return;
@@ -389,7 +387,7 @@ brw_vs_precompile(struct gl_context *ctx,
struct brw_stage_prog_data *old_prog_data = brw->vs.base.prog_data;
bool success;
- struct brw_vertex_program *bvp = brw_vertex_program(prog);
+ struct brw_program *bvp = brw_program(prog);
memset(&key, 0, sizeof(key));
diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h
index 25241a9..016f2bd 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -65,7 +65,7 @@ brw_upload_vs_prog(struct brw_context *brw);
bool
brw_codegen_vs_prog(struct brw_context *brw,
struct gl_shader_program *prog,
- struct brw_vertex_program *vp,
+ struct brw_program *vp,
struct brw_vs_prog_key *key);
void
diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
index a5a5a75..6a97cd4 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
@@ -113,8 +113,7 @@ brw_upload_vs_pull_constants(struct brw_context *brw)
struct brw_stage_state *stage_state = &brw->vs.base;
/* BRW_NEW_VERTEX_PROGRAM */
- struct brw_vertex_program *vp =
- (struct brw_vertex_program *) brw->vertex_program;
+ struct brw_program *vp = (struct brw_program *) brw->vertex_program;
/* BRW_NEW_VS_PROG_DATA */
const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data;
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 17ccd32..837762d 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -40,8 +40,7 @@ gen6_upload_vs_push_constants(struct brw_context *brw)
struct brw_stage_state *stage_state = &brw->vs.base;
/* _BRW_NEW_VERTEX_PROGRAM */
- const struct brw_vertex_program *vp =
- brw_vertex_program_const(brw->vertex_program);
+ const struct brw_program *vp = brw_program_const(brw->vertex_program);
/* BRW_NEW_VS_PROG_DATA */
const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data;
--
2.7.4
More information about the mesa-dev
mailing list