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

gl_BindTexture was broken when target==GL_TEXTURE_3D

Browse Source
This commit is contained in:
Brian Paul
1999-12-01 21:10:08 +00:00
parent eb6e3d3613
commit 420ef64f18
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mesa/main/texobj.c
View File

@@ -1,4 +1,4 @@
/* $Id: texobj.c,v 1.9 1999/11/12 04:57:04 kendallb Exp $ */ /* $Id: texobj.c,v 1.10 1999/12/01 21:10:08 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -56,10 +56,10 @@ gl_alloc_texture_object( struct gl_shared_state *shared, GLuint name,
{ {
struct gl_texture_object *obj; struct gl_texture_object *obj;
assert(dimensions <= 3); ASSERT(dimensions <= 3);
obj = CALLOC_STRUCT(gl_texture_object);
obj = (struct gl_texture_object *)
calloc(1,sizeof(struct gl_texture_object));
if (obj) { if (obj) {
/* init the non-zero fields */ /* init the non-zero fields */
obj->RefCount = 1; obj->RefCount = 1;
@@ -420,14 +420,21 @@ _mesa_BindTexture( GLenum target, GLuint texName )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBindTexture"); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBindTexture");
dim = (GLuint) (target - GL_TEXTURE_1D); switch (target) {
case GL_TEXTURE_1D:
if (dim > 2) { dim = 1;
gl_error( ctx, GL_INVALID_ENUM, "glBindTexture" ); break;
return; case GL_TEXTURE_2D:
dim = 2;
break;
case GL_TEXTURE_3D:
dim = 3;
break;
default:
gl_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
return;
} }
dim++;
oldTexObj = texUnit->CurrentD[dim]; oldTexObj = texUnit->CurrentD[dim];
if (oldTexObj->Name == texName) if (oldTexObj->Name == texName)
@@ -444,6 +451,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
if (newTexObj->Dimensions != dim) { if (newTexObj->Dimensions != dim) {
if (newTexObj->Dimensions) { if (newTexObj->Dimensions) {
/* the named texture object's dimensions don't match the target */
gl_error( ctx, GL_INVALID_OPERATION, "glBindTexture" ); gl_error( ctx, GL_INVALID_OPERATION, "glBindTexture" );
return; return;
} }