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

r300: export translateTexFormat function

This commit is contained in:
Maciej Cencora 2009-11-07 22:48:23 +01:00
parent 9975c484ad
commit bd58253f67
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
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
*/
static uint32_t translateTexFormat(gl_format mesaFormat)
uint32_t r300TranslateTexFormat(gl_format mesaFormat)
{
switch (mesaFormat)
{
@ -168,8 +168,6 @@ static uint32_t translateTexFormat(gl_format mesaFormat)
case MESA_FORMAT_SRGBA_DXT5:
return R300_EASY_TX_FORMAT(Y, Z, W, X, DXT5) | R300_TX_FORMAT_GAMMA;
default:
fprintf(stderr, "%s: Invalid format %s", __FUNCTION__, _mesa_get_format_name(mesaFormat));
assert(0);
return 0;
}
};
@ -254,7 +252,12 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t)
if (firstImage->_BaseFormat == GL_DEPTH_COMPONENT) {
r300SetDepthTexMode(&t->base);
} else {
t->pp_txformat = translateTexFormat(firstImage->TexFormat);
t->pp_txformat = r300TranslateTexFormat(firstImage->TexFormat);
if (t->pp_txformat == 0) {
_mesa_problem(rmesa->radeon.glCtx, "%s: Invalid format %s",
__FUNCTION__, _mesa_get_format_name(firstImage->TexFormat));
_mesa_exit(1);
}
}
}