diff options
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_manager.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 5142eb2dd..df73d0e1b 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -468,7 +468,7 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags, static boolean st_context_teximage(struct st_context_iface *stctxi, - enum st_texture_type target, + enum st_texture_type tex_type, int level, enum pipe_format internal_format, struct pipe_resource *tex, boolean mipmap) { @@ -481,8 +481,9 @@ st_context_teximage(struct st_context_iface *stctxi, struct st_texture_image *stImage; GLenum internalFormat; GLuint width, height, depth; + GLenum target; - switch (target) { + switch (tex_type) { case ST_TEXTURE_1D: target = GL_TEXTURE_1D; break; @@ -497,7 +498,6 @@ st_context_teximage(struct st_context_iface *stctxi, break; default: return FALSE; - break; } texObj = _mesa_select_tex_object(ctx, texUnit, target); @@ -533,7 +533,7 @@ st_context_teximage(struct st_context_iface *stctxi, else internalFormat = GL_RGB; - texFormat = st_ChooseTextureFormat(ctx, internalFormat, + texFormat = st_ChooseTextureFormat(ctx, target, internalFormat, GL_BGRA, GL_UNSIGNED_BYTE); _mesa_init_teximage_fields(ctx, texImage, @@ -637,7 +637,7 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, } st_visual_to_context_mode(&attribs->visual, &mode); - st = st_create_context(api, pipe, &mode, shared_ctx); + st = st_create_context(api, pipe, &mode, shared_ctx, &attribs->options); if (!st) { *error = ST_CONTEXT_ERROR_NO_MEMORY; pipe->destroy(pipe); |