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

st/mesa: remove unused needFlush parameter to st_finalize_texture()

Browse Source
This commit is contained in:
Brian Paul
2010-05-03 16:13:20 -06:00
parent 013b332cbc
commit 295a87f6c2
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/state_tracker/st_atom_texture.c
View File

@@ -62,7 +62,7 @@ update_textures(struct st_context *st)
if (samplersUsed & (1 << su)) { if (samplersUsed & (1 << su)) {
struct gl_texture_object *texObj; struct gl_texture_object *texObj;
struct st_texture_object *stObj; struct st_texture_object *stObj;
GLboolean flush, retval; GLboolean retval;
GLuint texUnit; GLuint texUnit;
if (fprog->Base.SamplersUsed & (1 << su)) if (fprog->Base.SamplersUsed & (1 << su))
@@ -77,7 +77,7 @@ update_textures(struct st_context *st)
} }
stObj = st_texture_object(texObj); stObj = st_texture_object(texObj);
retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush); retval = st_finalize_texture(st->ctx, st->pipe, texObj);
if (!retval) { if (!retval) {
/* out of mem */ /* out of mem */
continue; continue;
@@ -140,9 +140,9 @@ finalize_textures(struct st_context *st)
= st->ctx->Texture.Unit[texUnit]._Current; = st->ctx->Texture.Unit[texUnit]._Current;
if (texObj) { if (texObj) {
GLboolean flush, retval; GLboolean retval;
retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush); retval = st_finalize_texture(st->ctx, st->pipe, texObj);
if (!retval) { if (!retval) {
/* out of mem */ /* out of mem */
st->missing_textures = GL_TRUE; st->missing_textures = GL_TRUE;

6
src/mesa/state_tracker/st_cb_texture.c
View File

@@ -1812,8 +1812,7 @@ copy_image_data_to_texture(struct st_context *st,
GLboolean GLboolean
st_finalize_texture(GLcontext *ctx, st_finalize_texture(GLcontext *ctx,
struct pipe_context *pipe, struct pipe_context *pipe,
struct gl_texture_object *tObj, struct gl_texture_object *tObj)
GLboolean *needFlush)
{ {
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(tObj); struct st_texture_object *stObj = st_texture_object(tObj);
@@ -1822,8 +1821,6 @@ st_finalize_texture(GLcontext *ctx,
struct st_texture_image *firstImage; struct st_texture_image *firstImage;
enum pipe_format firstImageFormat; enum pipe_format firstImageFormat;
*needFlush = GL_FALSE;
if (stObj->base._Complete) { if (stObj->base._Complete) {
/* The texture is complete and we know exactly how many mipmap levels /* The texture is complete and we know exactly how many mipmap levels
* are present/needed. This is conditional because we may be called * are present/needed. This is conditional because we may be called
@@ -1908,7 +1905,6 @@ st_finalize_texture(GLcontext *ctx,
*/ */
if (stImage && stObj->pt != stImage->pt) { if (stImage && stObj->pt != stImage->pt) {
copy_image_data_to_texture(st, stObj, level, stImage); copy_image_data_to_texture(st, stObj, level, stImage);
*needFlush = GL_TRUE;
} }
} }
} }

3
src/mesa/state_tracker/st_cb_texture.h
View File

@@ -33,8 +33,7 @@
extern GLboolean extern GLboolean
st_finalize_texture(GLcontext *ctx, st_finalize_texture(GLcontext *ctx,
struct pipe_context *pipe, struct pipe_context *pipe,
struct gl_texture_object *tObj, struct gl_texture_object *tObj);
GLboolean *needFlush);
extern struct gl_texture_object * extern struct gl_texture_object *

3
src/mesa/state_tracker/st_gen_mipmap.c
View File

@@ -311,7 +311,6 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
* mipmap levels we need to generate. So allocate a new texture. * mipmap levels we need to generate. So allocate a new texture.
*/ */
struct pipe_resource *oldTex = stObj->pt; struct pipe_resource *oldTex = stObj->pt;
GLboolean needFlush;
/* create new texture with space for more levels */ /* create new texture with space for more levels */
stObj->pt = st_texture_create(st, stObj->pt = st_texture_create(st,
@@ -331,7 +330,7 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
/* This will copy the old texture's base image into the new texture /* This will copy the old texture's base image into the new texture
* which we just allocated. * which we just allocated.
*/ */
st_finalize_texture(ctx, st->pipe, texObj, &needFlush); st_finalize_texture(ctx, st->pipe, texObj);
/* release the old tex (will likely be freed too) */ /* release the old tex (will likely be freed too) */
pipe_resource_reference(&oldTex, NULL); pipe_resource_reference(&oldTex, NULL);