nvfx: add NVFX_NEW_{FRAG,VERT}CONST

diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index 8721eaa741a00f9065adfc9a896b4431fa543427..cb9049a448e41b85a4c038b94f4ea4ff126c833f 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -80,6 +80,8 @@ enum nvfx_state_index {
 #define NVFX_NEW_ARRAYS                (1 << 11)
 #define NVFX_NEW_UCP           (1 << 12)
 #define NVFX_NEW_SR            (1 << 13)
+#define NVFX_NEW_VERTCONST     (1 << 14)
+#define NVFX_NEW_FRAGCONST     (1 << 15)
 
 struct nvfx_rasterizer_state {
        struct pipe_rasterizer_state pipe;

diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 1b831379807608e81a426b82a07ffccf2b7e4196..eb815302485b0ff8ef905221903bee3196ebf8cd 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -980,7 +980,7 @@ nvfx_fragprog_destroy(struct nvfx_context *nvfx,
 struct nvfx_state_entry nvfx_state_fragprog = {
        .validate = nvfx_fragprog_validate,
        .dirty = {
-               .pipe = NVFX_NEW_FRAGPROG,
+               .pipe = NVFX_NEW_FRAGPROG | NVFX_NEW_FRAGCONST,
                .hw = 0
        }
 };

diff --git a/src/gallium/drivers/nvfx/nvfx_state.c b/src/gallium/drivers/nvfx/nvfx_state.c
index b91211584f7dde4d566147e0bd52e9a4287e6b8b..4053f28a651044ef0ac7e1c68fc5bd3314bf6d0e 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state.c
+++ b/src/gallium/drivers/nvfx/nvfx_state.c
@@ -496,10 +496,10 @@ nvfx_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
        nvfx->constbuf_nr[shader] = buf->width0 / (4 * sizeof(float));
 
        if (shader == PIPE_SHADER_VERTEX) {
-               nvfx->dirty |= NVFX_NEW_VERTPROG;
+               nvfx->dirty |= NVFX_NEW_VERTCONST;
        } else
        if (shader == PIPE_SHADER_FRAGMENT) {
-               nvfx->dirty |= NVFX_NEW_FRAGPROG;
+               nvfx->dirty |= NVFX_NEW_FRAGCONST;
        }
 }
 

diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 3d25ab761a3f0c35711248140bb0783469b2182f..4637212b18eb31a9f0b42ee7efea764cfc35ad1f 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -1039,6 +1039,6 @@ nvfx_vertprog_destroy(struct nvfx_context *nvfx, struct nvfx_vertex_program *vp)
 struct nvfx_state_entry nvfx_state_vertprog = {
        .validate = nvfx_vertprog_validate,
        .dirty = {
-               .pipe = NVFX_NEW_VERTPROG | NVFX_NEW_UCP,
+               .pipe = NVFX_NEW_VERTPROG | NVFX_NEW_VERTCONST | NVFX_NEW_UCP,
        }
 };