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

Remove #ifdef's around PolygonOffset function. 

Print number of missing entry for texture format.
Add alpha-luminance format.
This commit is contained in:
Vladimir Dergachev 2005-02-08 20:27:09 +00:00
parent a91e0218a3
commit 85199453cc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/dri/r300/r300_state.c
View File

@ -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)

2
src/mesa/drivers/dri/r300/r300_texstate.c
View File

@ -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},