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

st/mesa: don't invoke st_finalize_texture & st_convert_sampler for TBOs

Browse Source 
This is a v2 of the previous patch (v1 didn't skip st_finalize_texture).

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák
2017-06-20 21:32:28 +02:00
parent c0ed52f614
commit 9c499e6759
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2916,12 +2916,14 @@ st_NewTextureHandle(struct gl_context *ctx, struct gl_texture_object *texObj,
struct st_texture_object *stObj = st_texture_object(texObj); struct st_texture_object *stObj = st_texture_object(texObj);
struct pipe_context *pipe = st->pipe; struct pipe_context *pipe = st->pipe;
struct pipe_sampler_view *view; struct pipe_sampler_view *view;
struct pipe_sampler_state sampler; struct pipe_sampler_state sampler = {0};
if (!st_finalize_texture(ctx, pipe, texObj, 0)) if (texObj->Target != GL_TEXTURE_BUFFER) {
return 0; if (!st_finalize_texture(ctx, pipe, texObj, 0))
return 0;
st_convert_sampler(st, texObj, sampObj, &sampler); st_convert_sampler(st, texObj, sampObj, &sampler);
}
view = st_get_texture_sampler_view_from_stobj(st, stObj, sampObj, 0); view = st_get_texture_sampler_view_from_stobj(st, stObj, sampObj, 0);