summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c4
-rw-r--r--src/mesa/drivers/dri/r300/r300_texstate.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 38a61ae6c8e..0abe242958d 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -817,7 +817,6 @@ static void r300DepthRange(GLcontext * ctx, GLclampd nearval, GLclampd farval)
/* =============================================================
* Polygon state
*/
-#ifdef HAVE_ZBS
static void r300PolygonOffset(GLcontext * ctx, GLfloat factor, GLfloat units)
{
r300ContextPtr rmesa = R300_CONTEXT(ctx);
@@ -833,7 +832,6 @@ static void r300PolygonOffset(GLcontext * ctx, GLfloat factor, GLfloat units)
rmesa->hw.zbs.cmd[R300_ZBS_W_FACTOR] = r300PackFloat32(factor);
rmesa->hw.zbs.cmd[R300_ZBS_W_CONSTANT] = r300PackFloat32(constant);
}
-#endif
/* Routing and texture-related */
@@ -1212,7 +1210,7 @@ void r300_setup_textures(GLcontext *ctx)
}
//fprintf(stderr, "t->format=%08x\n", t->format);
if((t->format & 0xffffff00)==0xffffff00){
- WARN_ONCE("unknown texture format encountered. Help me !\n");
+ WARN_ONCE("unknown texture format (entry %x) encountered. Help me !\n", t->format & 0xff);
//fprintf(stderr, "t->format=%08x\n", t->format);
}
if (RADEON_DEBUG & DEBUG_STATE)
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index bb79c18ded3..949ce987e10 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -105,7 +105,7 @@ static const struct {
{0xffffff09, 0},
{0xffffff10, 0},
{0xffffff11, 0},
- {0xffffff12, 0},
+ {R300_EASY_TX_FORMAT(Y, Y, Y, X, Y8X8), 0},
{0xffffff13, 0},
{0xffffff14, 0},
{0xffffff15, 0},