diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-13 19:59:08 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-15 11:14:34 -0800 |
| commit | 80b3af5b6dbc6682baf63deda76a2ed203d586ae (patch) | |
| tree | d258879bb0a1f71965e8ab363e71ce73fda638f1 | |
| parent | eb18e3d32aa3c2c6775cb46b7f6fb92f949465ad (diff) | |
i965: Remove brw_shader_program wrapper struct.
At this point, it's just gl_shader_program. Nobody even uses it; even
the program that creates them only returns gl_shader_program pointers.
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 3911b22088c..49460e9f3cd 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -280,10 +280,6 @@ struct brw_shader { struct exec_list *ir; }; -struct brw_shader_program { - struct gl_shader_program base; -}; - /* Data about a particular attempt to compile a program. Note that * there can be many of these, each in a different GL state * corresponding to a different brw_wm_prog_key struct, with different diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index f8482e1695c..005779da9d9 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -48,13 +48,12 @@ brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type) struct gl_shader_program * brw_new_shader_program(struct gl_context *ctx, GLuint name) { - struct brw_shader_program *prog; - prog = rzalloc(NULL, struct brw_shader_program); + struct gl_shader_program *prog = rzalloc(NULL, struct gl_shader_program); if (prog) { - prog->base.Name = name; - _mesa_init_shader_program(ctx, &prog->base); + prog->Name = name; + _mesa_init_shader_program(ctx, prog); } - return &prog->base; + return prog; } /** |