AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Move push constants setup to emit() time.

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Eric Anholt
2011-10-22 10:43:05 -07:00
parent f84f3322b4
commit 9015969e6e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/gen6_vs_state.c
+3 -3
View File
@@ -34,7 +34,7 @@
#include "intel_batchbuffer.h"
static void
gen6_prepare_vs_push_constants(struct brw_context *brw)
gen6_upload_vs_push_constants(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
struct gl_context *ctx = &intel->ctx;
@@ -124,7 +124,7 @@ const struct brw_tracked_state gen6_vs_constants = {
BRW_NEW_VERTEX_PROGRAM),
.cache = CACHE_NEW_VS_PROG,
},
.prepare = gen6_prepare_vs_push_constants,
.emit = gen6_upload_vs_push_constants,
};
static void
@@ -147,7 +147,7 @@ upload_vs_state(struct brw_context *brw)
GEN6_CONSTANT_BUFFER_0_ENABLE |
(5 - 2));
/* Pointer to the VS constant buffer. Covered by the set of
* state flags from gen6_prepare_wm_constants
* state flags from gen6_upload_vs_constants
*/
OUT_BATCH(brw->vs.push_const_offset +
brw->vs.push_const_size - 1);
src/mesa/drivers/dri/i965/gen6_wm_state.c
+3 -3
View File
@@ -35,7 +35,7 @@
#include "intel_batchbuffer.h"
static void
gen6_prepare_wm_push_constants(struct brw_context *brw)
gen6_upload_wm_push_constants(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
struct gl_context *ctx = &intel->ctx;
@@ -87,7 +87,7 @@ const struct brw_tracked_state gen6_wm_constants = {
BRW_NEW_FRAGMENT_PROGRAM),
.cache = CACHE_NEW_WM_PROG,
},
.prepare = gen6_prepare_wm_push_constants,
.emit = gen6_upload_wm_push_constants,
};
static void
@@ -118,7 +118,7 @@ upload_wm_state(struct brw_context *brw)
GEN6_CONSTANT_BUFFER_0_ENABLE |
(5 - 2));
/* Pointer to the WM constant buffer. Covered by the set of
* state flags from gen6_prepare_wm_constants
* state flags from gen6_upload_wm_constants
*/
OUT_BATCH(brw->wm.push_const_offset +
ALIGN(brw->wm.prog_data->nr_params,