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

mesa/st: use PIPE_TEXTURE_RECT for GL_TEXTURE_RECTANGLE

Browse Source
This commit is contained in:
Luca Barbieri
2010-04-15 09:04:20 +02:00
parent 96a82cc314
commit 7f15dca6d9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,9 +74,11 @@ gl_target_to_pipe(GLenum target)
return PIPE_TEXTURE_1D; return PIPE_TEXTURE_1D;
case GL_TEXTURE_2D: case GL_TEXTURE_2D:
case GL_TEXTURE_RECTANGLE_NV:
return PIPE_TEXTURE_2D; return PIPE_TEXTURE_2D;
case GL_TEXTURE_RECTANGLE_NV:
return PIPE_TEXTURE_RECT;
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
return PIPE_TEXTURE_3D; return PIPE_TEXTURE_3D;
@@ -449,7 +451,7 @@ compress_with_blit(GLcontext * ctx,
/* Create the temporary source texture /* Create the temporary source texture
*/ */
memset(&templ, 0, sizeof(templ)); memset(&templ, 0, sizeof(templ));
templ.target = PIPE_TEXTURE_2D; templ.target = st->internal_target;
templ.format = st_mesa_format_to_pipe_format(mesa_format); templ.format = st_mesa_format_to_pipe_format(mesa_format);
templ.width0 = width; templ.width0 = width;
templ.height0 = height; templ.height0 = height;

2
src/mesa/state_tracker/st_texture.c
View File

@@ -64,7 +64,7 @@ st_texture_create(struct st_context *st,
struct pipe_resource pt, *newtex; struct pipe_resource pt, *newtex;
struct pipe_screen *screen = st->pipe->screen; struct pipe_screen *screen = st->pipe->screen;
assert(target <= PIPE_TEXTURE_CUBE); assert(target < PIPE_MAX_TEXTURE_TYPES);
assert(width0 > 0); assert(width0 > 0);
assert(height0 > 0); assert(height0 > 0);
assert(depth0 > 0); assert(depth0 > 0);