fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/gen4: Fold push constant prepare()/emit() together.

Browse source 
While other units need to know about our constant buffer offsets,
nothing else cared about which particular BO other than the emit() half.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Eric Anholt 2011-10-22 11:21:51 -07:00
parent 752cad8f33
commit 47c4d950cb
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/drivers/dri/i965/brw_curbe.c
View file

@ -179,9 +179,11 @@ static GLfloat fixed_plane[6][4] = {
* cache mechanism, but maybe would benefit from a comparison against * cache mechanism, but maybe would benefit from a comparison against
* the current uploaded set of constants. * the current uploaded set of constants.
*/ */
static void prepare_constant_buffer(struct brw_context *brw) static void
brw_upload_constant_buffer(struct brw_context *brw)
{ {
struct gl_context *ctx = &brw->intel.ctx; struct intel_context *intel = &brw->intel;
struct gl_context *ctx = &intel->ctx;
const struct brw_vertex_program *vp = const struct brw_vertex_program *vp =
brw_vertex_program_const(brw->vertex_program); brw_vertex_program_const(brw->vertex_program);
const GLuint sz = brw->curbe.total_size; const GLuint sz = brw->curbe.total_size;
@ -192,7 +194,7 @@ static void prepare_constant_buffer(struct brw_context *brw)
if (sz == 0) { if (sz == 0) {
brw->curbe.last_bufsz = 0; brw->curbe.last_bufsz = 0;
return; goto emit;
} }
buf = brw->curbe.next_buf; buf = brw->curbe.next_buf;
@ -335,22 +337,17 @@ static void prepare_constant_buffer(struct brw_context *brw)
* flushes as necessary when doublebuffering of CURBEs isn't * flushes as necessary when doublebuffering of CURBEs isn't
* possible. * possible.
*/ */
}
static void emit_constant_buffer(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
GLuint sz = brw->curbe.total_size;
emit:
BEGIN_BATCH(2); BEGIN_BATCH(2);
if (sz == 0) { if (brw->curbe.total_size == 0) {
OUT_BATCH((CMD_CONST_BUFFER << 16) | (2 - 2)); OUT_BATCH((CMD_CONST_BUFFER << 16) | (2 - 2));
OUT_BATCH(0); OUT_BATCH(0);
} else { } else {
OUT_BATCH((CMD_CONST_BUFFER << 16) | (1 << 8) | (2 - 2)); OUT_BATCH((CMD_CONST_BUFFER << 16) | (1 << 8) | (2 - 2));
OUT_RELOC(brw->curbe.curbe_bo, OUT_RELOC(brw->curbe.curbe_bo,
I915_GEM_DOMAIN_INSTRUCTION, 0, I915_GEM_DOMAIN_INSTRUCTION, 0,
(sz - 1) + brw->curbe.curbe_offset); (brw->curbe.total_size - 1) + brw->curbe.curbe_offset);
} }
ADVANCE_BATCH(); ADVANCE_BATCH();
} }
@ -372,7 +369,6 @@ const struct brw_tracked_state brw_constant_buffer = {
BRW_NEW_BATCH), BRW_NEW_BATCH),
.cache = (CACHE_NEW_WM_PROG) .cache = (CACHE_NEW_WM_PROG)
}, },
.prepare = prepare_constant_buffer, .emit = brw_upload_constant_buffer,
.emit = emit_constant_buffer,
}; };