fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: pass layers param to st_texture_create()

Browse source
This commit is contained in:
Brian Paul 2011-01-28 20:25:26 -07:00
parent 2a18d1950c
commit db3a8af7f9
7 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/state_tracker/st_atom_pixeltransfer.c
View file

@ -99,7 +99,7 @@ create_color_map_texture(struct gl_context *ctx)
/* create texture for color map/table */
pt = st_texture_create(st, PIPE_TEXTURE_2D, format, 0,
texSize, texSize, 1, PIPE_BIND_SAMPLER_VIEW);
texSize, texSize, 1, 1, PIPE_BIND_SAMPLER_VIEW);
return pt;
}

4
src/mesa/state_tracker/st_cb_bitmap.c
View file

@ -276,7 +276,7 @@ make_bitmap_texture(struct gl_context *ctx, GLsizei width, GLsizei height,
* Create texture to hold bitmap pattern.
*/
pt = st_texture_create(st, st->internal_target, st->bitmap.tex_format,
0, width, height, 1,
0, width, height, 1, 1,
PIPE_BIND_SAMPLER_VIEW);
if (!pt) {
_mesa_unmap_pbo_source(ctx, unpack);
@ -559,7 +559,7 @@ reset_cache(struct st_context *st)
cache->texture = st_texture_create(st, PIPE_TEXTURE_2D,
st->bitmap.tex_format, 0,
BITMAP_CACHE_WIDTH, BITMAP_CACHE_HEIGHT,
1,
1, 1,
PIPE_BIND_SAMPLER_VIEW);
}

2
src/mesa/state_tracker/st_cb_drawpixels.c
View file

@ -343,7 +343,7 @@ alloc_texture(struct st_context *st, GLsizei width, GLsizei height,
struct pipe_resource *pt;
pt = st_texture_create(st, st->internal_target, texFormat, 0,
width, height, 1, PIPE_BIND_SAMPLER_VIEW);
width, height, 1, 1, PIPE_BIND_SAMPLER_VIEW);
return pt;
}

2
src/mesa/state_tracker/st_cb_texture.c
View file

@ -359,6 +359,7 @@ guess_and_alloc_texture(struct st_context *st,
width,
height,
depth,
1,
bindings);
DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL));
@ -1902,6 +1903,7 @@ st_finalize_texture(struct gl_context *ctx,
stObj->width0,
stObj->height0,
stObj->depth0,
1,
bindings);
if (!stObj->pt) {

1
src/mesa/state_tracker/st_gen_mipmap.c
View file

@ -352,6 +352,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
oldTex->width0,
oldTex->height0,
oldTex->depth0,
oldTex->array_size,
oldTex->bind);
/* The texture isn't in a "complete" state yet so set the expected

1
src/mesa/state_tracker/st_texture.c
View file

@ -59,6 +59,7 @@ st_texture_create(struct st_context *st,
GLuint width0,
GLuint height0,
GLuint depth0,
GLuint layers,
GLuint bind )
{
struct pipe_resource pt, *newtex;

1
src/mesa/state_tracker/st_texture.h
View file

@ -168,6 +168,7 @@ st_texture_create(struct st_context *st,
GLuint width0,
GLuint height0,
GLuint depth0,
GLuint layers,
GLuint tex_usage );