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

replaced decode_internal_format() with _mesa_base_tex_format()

Browse Source
This commit is contained in:
Brian Paul
2000-03-23 16:23:14 +00:00
parent f87c5e229f
commit b132e8da5e
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.24 2000/03/22 17:38:11 brianp Exp $ */ /* $Id: teximage.c,v 1.25 2000/03/23 16:23:14 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -85,8 +85,8 @@ logbase2( int n )
* GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA. * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA.
* Return -1 if invalid enum. * Return -1 if invalid enum.
*/ */
static GLint GLint
decode_internal_format( GLint format ) _mesa_base_tex_format( GLint format )
{ {
switch (format) { switch (format) {
case GL_ALPHA: case GL_ALPHA:
@@ -356,7 +356,7 @@ init_texture_image( struct gl_texture_image *img,
{ {
ASSERT(img); ASSERT(img);
ASSERT(!img->Data); ASSERT(!img->Data);
img->Format = (GLenum) decode_internal_format(internalFormat); img->Format = (GLenum) _mesa_base_tex_format(internalFormat);
set_teximage_component_sizes( img ); set_teximage_component_sizes( img );
img->IntFormat = (GLenum) internalFormat; img->IntFormat = (GLenum) internalFormat;
img->Border = border; img->Border = border;
@@ -696,7 +696,7 @@ texture_error_check( GLcontext *ctx, GLenum target,
return GL_TRUE; return GL_TRUE;
} }
iformat = decode_internal_format( internalFormat ); iformat = _mesa_base_tex_format( internalFormat );
if (iformat < 0) { if (iformat < 0) {
if (!isProxy) { if (!isProxy) {
char message[100]; char message[100];
@@ -895,7 +895,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
return GL_TRUE; return GL_TRUE;
} }
iformat = decode_internal_format( internalFormat ); iformat = _mesa_base_tex_format( internalFormat );
if (iformat < 0) { if (iformat < 0) {
char message[100]; char message[100];
sprintf(message, "glCopyTexImage%dD(internalFormat)", dimensions); sprintf(message, "glCopyTexImage%dD(internalFormat)", dimensions);

6
src/mesa/main/teximage.h
View File

@@ -1,4 +1,4 @@
/* $Id: teximage.h,v 1.4 2000/01/31 23:10:16 brianp Exp $ */ /* $Id: teximage.h,v 1.5 2000/03/23 16:23:14 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -35,6 +35,10 @@
/*** Internal functions ***/ /*** Internal functions ***/
extern GLint
_mesa_base_tex_format( GLint format );
extern struct gl_texture_image * extern struct gl_texture_image *
gl_alloc_texture_image( void ); gl_alloc_texture_image( void );