summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_vs.h
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-10-01 15:21:57 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-10-02 14:22:54 -0700
commitbf7b6fd3fd6d98305d64ee6224ca9f9e7ba48444 (patch)
tree1fc147943d9e055f07feec578a12a268ec1cfe90 /src/mesa/drivers/dri/i965/brw_vs.h
parent404419ee1a57c79982d93eefe4de099d61ad2eee (diff)
downloadexternal_mesa3d-bf7b6fd3fd6d98305d64ee6224ca9f9e7ba48444.zip
external_mesa3d-bf7b6fd3fd6d98305d64ee6224ca9f9e7ba48444.tar.gz
external_mesa3d-bf7b6fd3fd6d98305d64ee6224ca9f9e7ba48444.tar.bz2
i965/shader: Get rid of the shader, prog, and shader_prog fields
Unfortunately, we can't get rid of them entirely. The FS backend still needs gl_program for handling TEXTURE_RECTANGLE. The GS vec4 backend still needs gl_shader_program for handling transfom feedback. However, the VS needs neither and we can substantially reduce the amount they are used. One day we will be free from their tyranny. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vs.h')
-rw-r--r--src/mesa/drivers/dri/i965/brw_vs.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h
index 8e16cd2..96d2435 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -87,8 +87,7 @@ public:
void *log_data,
const struct brw_vs_prog_key *key,
struct brw_vs_prog_data *vs_prog_data,
- struct gl_vertex_program *vp,
- struct gl_shader_program *prog,
+ nir_shader *shader,
gl_clip_plane *clip_planes,
void *mem_ctx,
int shader_time_index,
@@ -114,7 +113,6 @@ private:
const struct brw_vs_prog_key *const key;
struct brw_vs_prog_data * const vs_prog_data;
- struct gl_vertex_program *const vp;
src_reg *vp_temp_regs;
src_reg vp_addr_reg;