KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: change st_pbo_create_upload_fs to st_pbo_get_upload_fs 

For consistency with st_pbo_get_download_fs.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Nicolai Hähnle 2016-11-07 17:55:56 +01:00
parent 2fb4b5bdf6
commit 5e10a3d6e5
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1138,13 +1138,11 @@ try_pbo_upload_common(struct gl_context *ctx,
struct cso_context *cso = st->cso_context;
struct pipe_context *pipe = st->pipe;
bool success = false;
void *fs;
/* Create fragment shader */
if (!st->pbo.upload_fs) {
st->pbo.upload_fs = st_pbo_create_upload_fs(st);
if (!st->pbo.upload_fs)
return false;
}
fs = st_pbo_get_upload_fs(st);
if (!fs)
return false;
cso_save_state(cso, (CSO_BIT_FRAGMENT_SAMPLER_VIEWS |
CSO_BIT_FRAGMENT_SAMPLERS |
@ -1217,7 +1215,7 @@ try_pbo_upload_common(struct gl_context *ctx,
}
/* Set up the fragment shader */
cso_set_fragment_shader_handle(cso, st->pbo.upload_fs);
cso_set_fragment_shader_handle(cso, fs);
success = st_pbo_draw(st, addr, surface->width, surface->height);

7
src/mesa/state_tracker/st_pbo.c
View File

@ -515,9 +515,12 @@ create_fs(struct st_context *st, bool download, enum pipe_texture_target target)
}
void *
st_pbo_create_upload_fs(struct st_context *st)
st_pbo_get_upload_fs(struct st_context *st)
{
return create_fs(st, false, 0);
if (!st->pbo.upload_fs)
st->pbo.upload_fs = create_fs(st, false, 0);
return st->pbo.upload_fs;
}
void *

2
src/mesa/state_tracker/st_pbo.h
View File

@ -85,7 +85,7 @@ void *
st_pbo_create_gs(struct st_context *st);
void *
st_pbo_create_upload_fs(struct st_context *st);
st_pbo_get_upload_fs(struct st_context *st);
void *
st_pbo_get_download_fs(struct st_context *st, enum pipe_texture_target target);