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

minor clean-ups

Browse Source
This commit is contained in:
Brian Paul
2004-03-20 00:22:27 +00:00
parent 23be8efd6f
commit a212e9670b
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,16 +580,16 @@ _glthread_DECLARE_STATIC_MUTEX(GenTexturesLock);
* Generate texture names. * Generate texture names.
* *
* \param n number of texture names to be generated. * \param n number of texture names to be generated.
* \param texName an array in which will hold the generated texture names. * \param textures an array in which will hold the generated texture names.
* *
* \sa glGenTextures(). * \sa glGenTextures().
* *
* While holding the GenTexturesLock lock, calls _mesa_HashFindFreeKeyBlock() * While holding the GenTexturesLock lock, calls _mesa_HashFindFreeKeyBlock()
* to find a block of free texture IDs which are stored in \p texName. * to find a block of free texture IDs which are stored in \p textures.
* Corresponding empty texture objects are also generated. * Corresponding empty texture objects are also generated.
*/ */
void GLAPIENTRY void GLAPIENTRY
_mesa_GenTextures( GLsizei n, GLuint *texName ) _mesa_GenTextures( GLsizei n, GLuint *textures )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
GLuint first; GLuint first;
@@ -601,7 +601,7 @@ _mesa_GenTextures( GLsizei n, GLuint *texName )
return; return;
} }
if (!texName) if (!textures)
return; return;
/* /*
@@ -622,38 +622,41 @@ _mesa_GenTextures( GLsizei n, GLuint *texName )
return; return;
} }
_mesa_save_texture_object(ctx, texObj); _mesa_save_texture_object(ctx, texObj);
texName[i] = name; textures[i] = name;
} }
_glthread_UNLOCK_MUTEX(GenTexturesLock); _glthread_UNLOCK_MUTEX(GenTexturesLock);
} }
/** /**
* Delete named textures. * Delete named textures.
* *
* \param n number of textures to be deleted. * \param n number of textures to be deleted.
* \param texName array of textures names to be deleted. * \param textures array of texture IDs to be deleted.
* *
* \sa glDeleteTextures(). * \sa glDeleteTextures().
* *
* For each texture checks if its bound to any of the texture units, unbinding * If we're about to delete a texture that's currently bound to any
* it and decrementing the reference count if so. If the texture reference * texture unit, unbind the texture first. Decrement the reference
* count is zero, delete its object. * count on the texture object and delete it if it's zero.
* Recall that texture objects can be shared among several rendering
* contexts.
*/ */
void GLAPIENTRY void GLAPIENTRY
_mesa_DeleteTextures( GLsizei n, const GLuint *texName) _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
GLint i; GLint i;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */ ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
if (!texName) if (!textures)
return; return;
for (i=0;i<n;i++) { for (i = 0; i < n; i++) {
if (texName[i] > 0) { if (textures[i] > 0) {
struct gl_texture_object *delObj = (struct gl_texture_object *) struct gl_texture_object *delObj = (struct gl_texture_object *)
_mesa_HashLookup(ctx->Shared->TexObjects, texName[i]); _mesa_HashLookup(ctx->Shared->TexObjects, textures[i]);
if (delObj) { if (delObj) {
/* First check if this texture is currently bound. /* First check if this texture is currently bound.
* If so, unbind it and decrement the reference count. * If so, unbind it and decrement the reference count.