OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: choose texture format in core mesa, not drivers

Browse Source 
Call the ctx->Driver.ChooseTextureFormat() function from core Mesa's
_mesa_[Copy]TexImage functions instead of in the driver functions.
One less thing for drivers to do.
This commit is contained in:
Brian Paul
2009-10-25 18:06:18 -06:00
parent 355b5bde50
commit 11caea687e
12 changed files with 54 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/mesa/main/teximage.c
View File

@@ -2195,6 +2195,12 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
postConvWidth, 1, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
format, type);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
/* Give the texture to the driver. <pixels> may be null. */
ASSERT(ctx->Driver.TexImage1D);
ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
@@ -2311,6 +2317,12 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
postConvWidth, postConvHeight, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
format, type);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
/* Give the texture to the driver. <pixels> may be null. */
ASSERT(ctx->Driver.TexImage2D);
ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
@@ -2423,6 +2435,12 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
width, height, depth,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
format, type);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
/* Give the texture to the driver. <pixels> may be null. */
ASSERT(ctx->Driver.TexImage3D);
ctx->Driver.TexImage3D(ctx, target, level, internalFormat,
@@ -2735,6 +2753,12 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
_mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
GL_NONE, GL_NONE);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
ASSERT(ctx->Driver.CopyTexImage1D);
ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,
x, y, width, border);
@@ -2812,6 +2836,12 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
postConvWidth, postConvHeight, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
GL_NONE, GL_NONE);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
ASSERT(ctx->Driver.CopyTexImage2D);
ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,
x, y, width, height, border);
@@ -3290,6 +3320,12 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
_mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
GL_NONE, GL_NONE);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
ASSERT(ctx->Driver.CompressedTexImage1D);
ctx->Driver.CompressedTexImage1D(ctx, target, level,
internalFormat, width, border,
@@ -3396,6 +3432,12 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
_mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
GL_NONE, GL_NONE);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
ASSERT(ctx->Driver.CompressedTexImage2D);
ctx->Driver.CompressedTexImage2D(ctx, target, level,
internalFormat, width, height,
@@ -3501,6 +3543,12 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
width, height, depth,
border, internalFormat);
/* Choose actual texture format */
texImage->TexFormat =
ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
GL_NONE, GL_NONE);
ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
ASSERT(ctx->Driver.CompressedTexImage3D);
ctx->Driver.CompressedTexImage3D(ctx, target, level,
internalFormat,