diff options
| author | Dave Airlie <[email protected]> | 2015-08-24 09:52:12 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-08-26 10:22:09 +1000 |
| commit | c1452983b44cc8ee238b8c7e2cfca1105c707487 (patch) | |
| tree | 24e1c9c6e1601ad8c08873f76b47bb59bbde7de3 | |
| parent | 1d2a844e7d55645ea3d24fb589bec03695b3d2b1 (diff) | |
mesa/texgetimage: fix missing stencil check
GetTexImage can read to stencil8 but only from
a stencil or depthstencil textures.
This fixes a bunch of failures in CTS
GL33-CTS.gtf32.GL3Tests.packed_pixels
Reviewed-by: Marek Olšák <[email protected]>
Cc: "11.0" <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/mesa/main/texgetimage.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 3c1e166ffa1..f62553dac24 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -1213,6 +1213,13 @@ getteximage_error_check(struct gl_context *ctx, "%s(format=GL_STENCIL_INDEX)", caller); return true; } + else if (_mesa_is_stencil_format(format) + && !_mesa_is_depthstencil_format(baseFormat) + && !_mesa_is_stencil_format(baseFormat)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(format mismatch)", caller); + return true; + } else if (_mesa_is_ycbcr_format(format) && !_mesa_is_ycbcr_format(baseFormat)) { _mesa_error(ctx, GL_INVALID_OPERATION, |