projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Also do constant propagation for the second operand of CMP.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_sf.c
diff --git
a/src/mesa/drivers/dri/i965/brw_sf.c
b/src/mesa/drivers/dri/i965/brw_sf.c
index 57d1c29ade11cd0f5608dc0417ac5f776396d833..7d005d278fbd1d6ec5ae3cb72e3fe7f97ae2bc89 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_sf.c
+++ b/
src/mesa/drivers/dri/i965/brw_sf.c
@@
-46,6
+46,7
@@
static void compile_sf_prog( struct brw_context *brw,
struct brw_sf_prog_key *key )
{
static void compile_sf_prog( struct brw_context *brw,
struct brw_sf_prog_key *key )
{
+ struct intel_context *intel = &brw->intel;
struct brw_sf_compile c;
const GLuint *program;
GLuint program_size;
struct brw_sf_compile c;
const GLuint *program;
GLuint program_size;
@@
-107,9
+108,17
@@
static void compile_sf_prog( struct brw_context *brw,
*/
program = brw_get_program(&c.func, &program_size);
*/
program = brw_get_program(&c.func, &program_size);
+ if (INTEL_DEBUG & DEBUG_SF) {
+ printf("sf:\n");
+ for (i = 0; i < program_size / sizeof(struct brw_instruction); i++)
+ brw_disasm(stdout, &((struct brw_instruction *)program)[i],
+ intel->gen);
+ printf("\n");
+ }
+
/* Upload
*/
/* Upload
*/
- dr
i
_bo_unreference(brw->sf.prog_bo);
+ dr
m_intel
_bo_unreference(brw->sf.prog_bo);
brw->sf.prog_bo = brw_upload_cache_with_auxdata(&brw->cache, BRW_SF_PROG,
&c.key, sizeof(c.key),
NULL, 0,
brw->sf.prog_bo = brw_upload_cache_with_auxdata(&brw->cache, BRW_SF_PROG,
&c.key, sizeof(c.key),
NULL, 0,
@@
-154,6
+163,7
@@
static void upload_sf_prog(struct brw_context *brw)
break;
}
break;
}
+ /* _NEW_POINT */
key.do_point_sprite = ctx->Point.PointSprite;
if (key.do_point_sprite) {
int i;
key.do_point_sprite = ctx->Point.PointSprite;
if (key.do_point_sprite) {
int i;
@@
-181,7
+191,7
@@
static void upload_sf_prog(struct brw_context *brw)
key.frontface_ccw = (ctx->Polygon.FrontFace == GL_CCW) ^ (ctx->DrawBuffer->Name != 0);
}
key.frontface_ccw = (ctx->Polygon.FrontFace == GL_CCW) ^ (ctx->DrawBuffer->Name != 0);
}
- dr
i
_bo_unreference(brw->sf.prog_bo);
+ dr
m_intel
_bo_unreference(brw->sf.prog_bo);
brw->sf.prog_bo = brw_search_cache(&brw->cache, BRW_SF_PROG,
&key, sizeof(key),
NULL, 0,
brw->sf.prog_bo = brw_search_cache(&brw->cache, BRW_SF_PROG,
&key, sizeof(key),
NULL, 0,