diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2015-08-24 10:09:52 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-08-27 10:58:10 +0300 |
| commit | 16ad1d2a8d9d1d2d816f8b8d70f1134a7d4ba8dc (patch) | |
| tree | 7473313a2607199b68103978c20611b594e6ed54 /src/mesa/main/texobj.c | |
| parent | c2c64fd26999cedf4b63c754145f7258517f5bce (diff) | |
| download | external_mesa3d-16ad1d2a8d9d1d2d816f8b8d70f1134a7d4ba8dc.zip external_mesa3d-16ad1d2a8d9d1d2d816f8b8d70f1134a7d4ba8dc.tar.gz external_mesa3d-16ad1d2a8d9d1d2d816f8b8d70f1134a7d4ba8dc.tar.bz2 | |
mesa: enable enums for OES_texture_storage_multisample_2d_array
v2: use _mesa_is_gles31(ctx) for verifying we are on ES 3.1,
remove _es31 usage from get_hash_params.py
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index c5d83e1..a1be1e3 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1612,7 +1612,8 @@ _mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target) return ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample) || _mesa_is_gles31(ctx)) ? TEXTURE_2D_MULTISAMPLE_INDEX: -1; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample + return ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample) || + _mesa_is_gles31(ctx)) ? TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX: -1; default: return -1; |