diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-28 14:07:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-28 14:07:02 +0200 |
| commit | 05d67ae9117e5157fd1a5175dde6d7e48caf4653 (patch) | |
| tree | 601c92c99a901b165664df7482c7baf538d4d7c5 /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
| parent | b3462c12542a69eeaa3fe90fddfbb15d30c18158 (diff) | |
| download | vcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.tar.gz vcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.tar.bz2 vcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.zip | |
fontconfig mesa xserver git update 28 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 3de96adf3..ed3bbc725 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -989,6 +989,16 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, goto fallback; } + if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) { + /* 1D arrays might be thought of as 2D images but the actual layout + * might not be that way. At some points, we convert OpenGL's 1D + * array 'height' into gallium 'layers' and that prevents the blit + * utility code from doing the right thing. Simpy use the memcpy-based + * fallback. + */ + goto fallback; + } + if (matching_base_formats && src_format == dest_format && !do_flip) { |