initialize texture priorities to 1.0, clean-up of _mesa_PrioritizeTextures()
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* Mesa 3-D graphics library
|
||||||
* Version: 3.3
|
* Version: 3.5
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
|
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
|
||||||
*
|
*
|
||||||
@@ -65,6 +65,7 @@ gl_alloc_texture_object( struct gl_shared_state *shared, GLuint name,
|
|||||||
obj->RefCount = 1;
|
obj->RefCount = 1;
|
||||||
obj->Name = name;
|
obj->Name = name;
|
||||||
obj->Dimensions = dimensions;
|
obj->Dimensions = dimensions;
|
||||||
|
obj->Priority = 1.0F;
|
||||||
obj->WrapS = GL_REPEAT;
|
obj->WrapS = GL_REPEAT;
|
||||||
obj->WrapT = GL_REPEAT;
|
obj->WrapT = GL_REPEAT;
|
||||||
obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
|
obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
|
||||||
@@ -610,19 +611,17 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
|
|||||||
GLint i;
|
GLint i;
|
||||||
|
|
||||||
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPrioritizeTextures");
|
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPrioritizeTextures");
|
||||||
if (n<0) {
|
if (n < 0) {
|
||||||
gl_error( ctx, GL_INVALID_VALUE, "glPrioritizeTextures" );
|
gl_error( ctx, GL_INVALID_VALUE, "glPrioritizeTextures" );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i=0;i<n;i++) {
|
for (i = 0; i < n; i++) {
|
||||||
struct gl_texture_object *t;
|
if (texName[i] > 0) {
|
||||||
if (texName[i]>0) {
|
struct gl_texture_object *t = (struct gl_texture_object *)
|
||||||
t = (struct gl_texture_object *)
|
|
||||||
_mesa_HashLookup(ctx->Shared->TexObjects, texName[i]);
|
_mesa_HashLookup(ctx->Shared->TexObjects, texName[i]);
|
||||||
if (t) {
|
if (t) {
|
||||||
t->Priority = CLAMP( priorities[i], 0.0F, 1.0F );
|
t->Priority = CLAMP( priorities[i], 0.0F, 1.0F );
|
||||||
|
|
||||||
if (ctx->Driver.PrioritizeTexture)
|
if (ctx->Driver.PrioritizeTexture)
|
||||||
ctx->Driver.PrioritizeTexture( ctx, t, t->Priority );
|
ctx->Driver.PrioritizeTexture( ctx, t, t->Priority );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user