summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nvfx/nvfx_context.h
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-08-22 16:15:51 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-08-22 20:28:27 +0200
commitdf86f1e7d50e01b92e03dc25fa9e9258d2d4fa2f (patch)
treebd0c4eaa6bee0f09d091d53d150f0189c5d4a9fc /src/gallium/drivers/nvfx/nvfx_context.h
parent47537a4557c8a264f1e0eb308aff07464c81e0ca (diff)
nvfx: refactor to support multiple fragment program versions
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_context.h')
-rw-r--r--src/gallium/drivers/nvfx/nvfx_context.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index 02e8ed0178..2134f3c386 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -161,7 +161,7 @@ struct nvfx_context {
unsigned stipple[32];
struct pipe_clip_state clip;
struct nvfx_vertex_program *vertprog;
- struct nvfx_fragment_program *fragprog;
+ struct nvfx_pipe_fragment_program *fragprog;
struct pipe_resource *constbuf[PIPE_SHADER_TYPES];
unsigned constbuf_nr[PIPE_SHADER_TYPES];
struct nvfx_rasterizer_state *rasterizer;
@@ -174,6 +174,8 @@ struct nvfx_context {
struct pipe_index_buffer idxbuf;
struct nvfx_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
+ struct nvfx_pipe_fragment_program* dummy_fs;
+
unsigned nr_samplers;
unsigned nr_textures;
unsigned dirty_samplers;
@@ -195,6 +197,7 @@ struct nvfx_context {
struct nvfx_render_target hw_zeta;
int hw_pointsprite_control;
int hw_vp_output;
+ struct nvfx_fragment_program* hw_fragprog;
};
static INLINE struct nvfx_context *