diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
| commit | f04df7c7d4200343558dc9a14b6f48d10dedefcb (patch) | |
| tree | a988fc1e4d433fbbbeb98915f611d5bf557465a9 /mesalib/src/mesa/state_tracker/st_cb_bitmap.c | |
| parent | 1c4b85ef1eee929ccef4fb91f9f87f996b7b9e2d (diff) | |
| parent | cacf23d832a26e35851c9cc666304ac72cf8fe34 (diff) | |
| download | vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.gz vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.bz2 vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_bitmap.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c index a3e39dd49..ddd130a81 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c @@ -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);
}
|