From d74a817b86f7131c2cb1ab8916d4d12f718b3977 Mon Sep 17 00:00:00 2001 From: Tapani Pälli Date: Fri, 16 Jan 2015 12:48:43 +0200 Subject: mesa: support GL_RGB for GL_EXT_texture_type_2_10_10_10_REV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 8ec6534 changed texture upload path and the way how texture format is being checked, this commit adds support for GL_RGB with GL_UNSIGNED_INT_2_10_10_10_REV as specified by the extension EXT_texture_type_2_10_10_10_REV specification. This fixes regression in ES3 conformance test ES3-CTS.gtf.GL3Tests.packed_pixels.packed_pixels v2: add MESA_FORMAT_R10G10B10X2_UNORM format (Iago Toral) Signed-off-by: Tapani Pälli Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88385 Reviewed-by: Jason Ekstrand Reviewed-by: Iago Toral Quiroga --- src/mesa/swrast/s_texfetch.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index a0f34fd100e..9629024b9bc 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -166,6 +166,8 @@ texfetch_funcs[] = FETCH_FUNCS(B10G10R10A2_UNORM), FETCH_NULL(B10G10R10X2_UNORM), FETCH_FUNCS(R10G10B10A2_UNORM), + FETCH_NULL(R10G10B10X2_UNORM), + FETCH_FUNCS(S8_UINT_Z24_UNORM), { MESA_FORMAT_X8_UINT_Z24_UNORM, -- cgit v1.2.3