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

r300: fix regression introduced by da73c1ed 

The 0 value is correct for I8 format.
This commit is contained in:
Maciej Cencora 2009-12-13 17:18:50 +01:00
parent 9d8501bf27
commit 8403df33e0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ static void r300_emit_tx_setup(struct r300_context *r300,
assert(width <= 2048);
assert(height <= 2048);
assert(r300TranslateTexFormat(mesa_format) != 0);
assert(r300TranslateTexFormat(mesa_format) >= 0);
assert(offset % 32 == 0);
BEGIN_BATCH(17);

2
src/mesa/drivers/dri/r300/r300_tex.h
View File

@ -51,6 +51,6 @@ extern GLboolean r300ValidateBuffers(GLcontext * ctx);
extern void r300InitTextureFuncs(struct dd_function_table *functions);
uint32_t r300TranslateTexFormat(gl_format mesaFormat);
int32_t r300TranslateTexFormat(gl_format mesaFormat);
#endif /* __r300_TEX_H__ */

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

@ -59,7 +59,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* identically. -- paulus
*/
uint32_t r300TranslateTexFormat(gl_format mesaFormat)
int32_t r300TranslateTexFormat(gl_format mesaFormat)
{
switch (mesaFormat)
{
@ -168,7 +168,7 @@ uint32_t r300TranslateTexFormat(gl_format mesaFormat)
case MESA_FORMAT_SRGBA_DXT5:
return R300_EASY_TX_FORMAT(Y, Z, W, X, DXT5) | R300_TX_FORMAT_GAMMA;
default:
return 0;
return -1;
}
};
@ -252,12 +252,13 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t)
if (firstImage->_BaseFormat == GL_DEPTH_COMPONENT) {
r300SetDepthTexMode(&t->base);
} else {
t->pp_txformat = r300TranslateTexFormat(firstImage->TexFormat);
if (t->pp_txformat == 0) {
int32_t txformat = r300TranslateTexFormat(firstImage->TexFormat);
if (txformat < 0) {
_mesa_problem(rmesa->radeon.glCtx, "%s: Invalid format %s",
__FUNCTION__, _mesa_get_format_name(firstImage->TexFormat));
_mesa_exit(1);
}
t->pp_txformat = (uint32_t) txformat;
}
}