On Tue, Jun 5, 2012 at 5:03 PM, Paul Berry <[email protected]> wrote: > This patch augments the format_desc structure (used by fbo-formats.h > to describe a format to be tested) with a base_internal_format field, > which indicates the base internal format corresponding to each > particular internal format (e.g. the base internal format of > GL_R3_G3_B2 is GL_RGB). > > The field test_desc::base (which carries the same information, but > only for depth/stencil formats, and is sometimes incorrect) will be > removed in a later patch. > --- > tests/fbo/fbo-formats.h | 387 > ++++++++++++++++++++++++----------------------- > 1 files changed, 199 insertions(+), 188 deletions(-) > > diff --git a/tests/fbo/fbo-formats.h b/tests/fbo/fbo-formats.h > index a70954f..52c42d8 100644 > --- a/tests/fbo/fbo-formats.h > +++ b/tests/fbo/fbo-formats.h > @@ -29,260 +29,271 @@ > struct format_desc { > GLenum internalformat; > const char *name; > + > + /** > + * Base internal format corresponding to internalformat. See > + * for example the GL 3.0 spec, tables 3.16 through 3.19. > + * > + * Base internal format is always one of the following: > + * GL_ALPHA, GL_DEPTH_COMPONENT, GL_DEPTH_STENCIL, > + * GL_INTENSITY, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RED, > + * GL_RG, GL_RGB, GL_RGBA. > + */ > + GLenum base_internal_format; > }; > > -#define FORMAT(f) { f, #f } > +#define FORMAT(f, base_internal_format) { f, #f, base_internal_format } > static const struct format_desc core[] = { > - FORMAT(3), > - FORMAT(4), > - FORMAT(GL_RGB), > - FORMAT(GL_RGBA), > - FORMAT(GL_ALPHA), > - FORMAT(GL_LUMINANCE), > - FORMAT(GL_LUMINANCE_ALPHA), > - FORMAT(GL_INTENSITY), > - > - FORMAT(GL_ALPHA4), > - FORMAT(GL_ALPHA8), > - FORMAT(GL_ALPHA12), > - FORMAT(GL_ALPHA16), > - > - FORMAT(GL_LUMINANCE4), > - FORMAT(GL_LUMINANCE8), > - FORMAT(GL_LUMINANCE12), > - FORMAT(GL_LUMINANCE16), > - > - FORMAT(GL_LUMINANCE4_ALPHA4), > - FORMAT(GL_LUMINANCE8_ALPHA8), > - FORMAT(GL_LUMINANCE12_ALPHA12), > - FORMAT(GL_LUMINANCE16_ALPHA16), > - > - FORMAT(GL_INTENSITY4), > - FORMAT(GL_INTENSITY8), > - FORMAT(GL_INTENSITY12), > - FORMAT(GL_INTENSITY16), > - > - FORMAT(GL_R3_G3_B2), > - FORMAT(GL_RGB4), > - FORMAT(GL_RGB5), > - FORMAT(GL_RGB8), > - FORMAT(GL_RGB10), > - FORMAT(GL_RGB12), > - FORMAT(GL_RGB16), > - > - FORMAT(GL_RGBA2), > - FORMAT(GL_RGBA4), > - FORMAT(GL_RGB5_A1), > - FORMAT(GL_RGBA8), > - FORMAT(GL_RGB10_A2), > - FORMAT(GL_RGBA12), > - FORMAT(GL_RGBA16), > + FORMAT(3, GL_RGB), > + FORMAT(4, GL_RGBA), > + FORMAT(GL_RGB, GL_RGB), > + FORMAT(GL_RGBA, GL_RGBA), > + FORMAT(GL_ALPHA, GL_ALPHA), > + FORMAT(GL_LUMINANCE, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA), > + FORMAT(GL_INTENSITY, GL_INTENSITY), > + > + FORMAT(GL_ALPHA4, GL_ALPHA), > + FORMAT(GL_ALPHA8, GL_ALPHA), > + FORMAT(GL_ALPHA12, GL_ALPHA), > + FORMAT(GL_ALPHA16, GL_ALPHA), > + > + FORMAT(GL_LUMINANCE4, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE8, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE12, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE16, GL_LUMINANCE), > + > + FORMAT(GL_LUMINANCE4_ALPHA4, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE8_ALPHA8, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE12_ALPHA12, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE16_ALPHA16, GL_LUMINANCE_ALPHA), > + > + FORMAT(GL_INTENSITY4, GL_INTENSITY), > + FORMAT(GL_INTENSITY8, GL_INTENSITY), > + FORMAT(GL_INTENSITY12, GL_INTENSITY), > + FORMAT(GL_INTENSITY16, GL_INTENSITY), > + > + FORMAT(GL_R3_G3_B2, GL_RGB), > + FORMAT(GL_RGB4, GL_RGB), > + FORMAT(GL_RGB5, GL_RGB), > + FORMAT(GL_RGB8, GL_RGB), > + FORMAT(GL_RGB10, GL_RGB), > + FORMAT(GL_RGB12, GL_RGB), > + FORMAT(GL_RGB16, GL_RGB), > + > + FORMAT(GL_RGBA2, GL_RGBA), > + FORMAT(GL_RGBA4, GL_RGBA), > + FORMAT(GL_RGB5_A1, GL_RGBA), > + FORMAT(GL_RGBA8, GL_RGBA), > + FORMAT(GL_RGB10_A2, GL_RGBA), > + FORMAT(GL_RGBA12, GL_RGBA), > + FORMAT(GL_RGBA16, GL_RGBA), > }; > > static const struct format_desc arb_depth_texture[] = { > - FORMAT(GL_DEPTH_COMPONENT), > - FORMAT(GL_DEPTH_COMPONENT16), > - FORMAT(GL_DEPTH_COMPONENT24), > - FORMAT(GL_DEPTH_COMPONENT32), > + FORMAT(GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT), > + FORMAT(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT), > + FORMAT(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT), > + FORMAT(GL_DEPTH_COMPONENT32, GL_DEPTH_COMPONENT), > }; > > static const struct format_desc ext_packed_depth_stencil[] = { > - FORMAT(GL_DEPTH_STENCIL_EXT), > - FORMAT(GL_DEPTH24_STENCIL8_EXT), > + FORMAT(GL_DEPTH_STENCIL_EXT, GL_DEPTH_STENCIL), > + FORMAT(GL_DEPTH24_STENCIL8_EXT, GL_DEPTH_STENCIL), > }; > > static const struct format_desc ext_texture_srgb[] = { > - FORMAT(GL_SRGB_EXT), > - FORMAT(GL_SRGB8_EXT), > - FORMAT(GL_SRGB_ALPHA_EXT), > - FORMAT(GL_SRGB8_ALPHA8_EXT), > - FORMAT(GL_SLUMINANCE_ALPHA_EXT), > - FORMAT(GL_SLUMINANCE8_ALPHA8_EXT), > - FORMAT(GL_SLUMINANCE_EXT), > - FORMAT(GL_SLUMINANCE8_EXT), > + FORMAT(GL_SRGB_EXT, GL_RGB), > + FORMAT(GL_SRGB8_EXT, GL_RGB), > + FORMAT(GL_SRGB_ALPHA_EXT, GL_RGBA), > + FORMAT(GL_SRGB8_ALPHA8_EXT, GL_RGBA), > + FORMAT(GL_SLUMINANCE_ALPHA_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_SLUMINANCE8_ALPHA8_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_SLUMINANCE_EXT, GL_LUMINANCE), > + FORMAT(GL_SLUMINANCE8_EXT, GL_LUMINANCE), > }; > > static const struct format_desc ext_texture_srgb_compressed[] = { > - FORMAT(GL_COMPRESSED_SRGB_EXT), > - FORMAT(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT), > - FORMAT(GL_COMPRESSED_SRGB_ALPHA_EXT), > - FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT), > - FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT), > - FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT), > - FORMAT(GL_COMPRESSED_SLUMINANCE_ALPHA_EXT), > - FORMAT(GL_COMPRESSED_SLUMINANCE_EXT), > + FORMAT(GL_COMPRESSED_SRGB_EXT, GL_RGB), > + FORMAT(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, GL_RGB), > + FORMAT(GL_COMPRESSED_SRGB_ALPHA_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_SLUMINANCE_ALPHA_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_COMPRESSED_SLUMINANCE_EXT, GL_LUMINANCE), > }; > > static const struct format_desc ext_texture_compression[] = { > - FORMAT(GL_COMPRESSED_ALPHA), > - FORMAT(GL_COMPRESSED_LUMINANCE), > - FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA), > - FORMAT(GL_COMPRESSED_INTENSITY), > - FORMAT(GL_COMPRESSED_RGB), > - FORMAT(GL_COMPRESSED_RGBA), > + FORMAT(GL_COMPRESSED_ALPHA, GL_ALPHA), > + FORMAT(GL_COMPRESSED_LUMINANCE, GL_LUMINANCE), > + FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA), > + FORMAT(GL_COMPRESSED_INTENSITY, GL_INTENSITY), > + FORMAT(GL_COMPRESSED_RGB, GL_RGB), > + FORMAT(GL_COMPRESSED_RGBA, GL_RGBA), > }; > > static const struct format_desc tdfx_texture_compression_fxt1[] = { > - FORMAT(GL_COMPRESSED_RGB_FXT1_3DFX), > - FORMAT(GL_COMPRESSED_RGBA_FXT1_3DFX), > + FORMAT(GL_COMPRESSED_RGB_FXT1_3DFX, GL_RGB), > + FORMAT(GL_COMPRESSED_RGBA_FXT1_3DFX, GL_RGBA), > }; > > static const struct format_desc ext_texture_compression_s3tc[] = { > - FORMAT(GL_COMPRESSED_RGB_S3TC_DXT1_EXT), > - FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT), > - FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT), > - FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT), > + FORMAT(GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_RGB), > + FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA), > + FORMAT(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA), > }; > > static const struct format_desc ext_texture_integer[] = { > - FORMAT(GL_RGBA8UI_EXT), > - FORMAT(GL_RGBA16UI_EXT), > - FORMAT(GL_RGBA32UI_EXT), > - FORMAT(GL_RGBA8I_EXT), > - FORMAT(GL_RGBA16I_EXT), > - FORMAT(GL_RGBA32I_EXT), > - FORMAT(GL_RGB8UI_EXT), > - FORMAT(GL_RGB16UI_EXT), > - FORMAT(GL_RGB32UI_EXT), > - FORMAT(GL_RGB8I_EXT), > - FORMAT(GL_RGB16I_EXT), > - FORMAT(GL_RGB32I_EXT), > - FORMAT(GL_ALPHA8UI_EXT), > - FORMAT(GL_ALPHA16UI_EXT), > - FORMAT(GL_ALPHA32UI_EXT), > - FORMAT(GL_ALPHA8I_EXT), > - FORMAT(GL_ALPHA16I_EXT), > - FORMAT(GL_ALPHA32I_EXT), > - FORMAT(GL_INTENSITY8UI_EXT), > - FORMAT(GL_INTENSITY16UI_EXT), > - FORMAT(GL_INTENSITY32UI_EXT), > - FORMAT(GL_INTENSITY8I_EXT), > - FORMAT(GL_INTENSITY16I_EXT), > - FORMAT(GL_INTENSITY32I_EXT), > - FORMAT(GL_LUMINANCE8UI_EXT), > - FORMAT(GL_LUMINANCE16UI_EXT), > - FORMAT(GL_LUMINANCE32UI_EXT), > - FORMAT(GL_LUMINANCE8I_EXT), > - FORMAT(GL_LUMINANCE16I_EXT), > - FORMAT(GL_LUMINANCE32I_EXT), > - FORMAT(GL_LUMINANCE_ALPHA8UI_EXT), > - FORMAT(GL_LUMINANCE_ALPHA16UI_EXT), > - FORMAT(GL_LUMINANCE_ALPHA32UI_EXT), > - FORMAT(GL_LUMINANCE_ALPHA8I_EXT), > - FORMAT(GL_LUMINANCE_ALPHA16I_EXT), > - FORMAT(GL_LUMINANCE_ALPHA32I_EXT), > + FORMAT(GL_RGBA8UI_EXT, GL_RGBA), > + FORMAT(GL_RGBA16UI_EXT, GL_RGBA), > + FORMAT(GL_RGBA32UI_EXT, GL_RGBA), > + FORMAT(GL_RGBA8I_EXT, GL_RGBA), > + FORMAT(GL_RGBA16I_EXT, GL_RGBA), > + FORMAT(GL_RGBA32I_EXT, GL_RGBA), > + FORMAT(GL_RGB8UI_EXT, GL_RGB), > + FORMAT(GL_RGB16UI_EXT, GL_RGB), > + FORMAT(GL_RGB32UI_EXT, GL_RGB), > + FORMAT(GL_RGB8I_EXT, GL_RGB), > + FORMAT(GL_RGB16I_EXT, GL_RGB), > + FORMAT(GL_RGB32I_EXT, GL_RGB), > + FORMAT(GL_ALPHA8UI_EXT, GL_ALPHA), > + FORMAT(GL_ALPHA16UI_EXT, GL_ALPHA), > + FORMAT(GL_ALPHA32UI_EXT, GL_ALPHA), > + FORMAT(GL_ALPHA8I_EXT, GL_ALPHA), > + FORMAT(GL_ALPHA16I_EXT, GL_ALPHA), > + FORMAT(GL_ALPHA32I_EXT, GL_ALPHA), > + FORMAT(GL_INTENSITY8UI_EXT, GL_INTENSITY), > + FORMAT(GL_INTENSITY16UI_EXT, GL_INTENSITY), > + FORMAT(GL_INTENSITY32UI_EXT, GL_INTENSITY), > + FORMAT(GL_INTENSITY8I_EXT, GL_INTENSITY), > + FORMAT(GL_INTENSITY16I_EXT, GL_INTENSITY), > + FORMAT(GL_INTENSITY32I_EXT, GL_INTENSITY), > + FORMAT(GL_LUMINANCE8UI_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE16UI_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE32UI_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE8I_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE16I_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE32I_EXT, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE_ALPHA8UI_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE_ALPHA16UI_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE_ALPHA32UI_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE_ALPHA8I_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE_ALPHA16I_EXT, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE_ALPHA32I_EXT, GL_LUMINANCE_ALPHA), > }; > > static const struct format_desc arb_texture_rg[] = { > - FORMAT(GL_R8), > - FORMAT(GL_R16), > - FORMAT(GL_RG), > - FORMAT(GL_RG8), > - FORMAT(GL_RG16), > + FORMAT(GL_R8, GL_RED), > + FORMAT(GL_R16, GL_RED), > + FORMAT(GL_RG, GL_RG), > + FORMAT(GL_RG8, GL_RG), > + FORMAT(GL_RG16, GL_RG), > }; > > static const struct format_desc arb_texture_rg_int[] = { > - FORMAT(GL_R8I), > - FORMAT(GL_R8UI), > - FORMAT(GL_R16I), > - FORMAT(GL_R16UI), > - FORMAT(GL_R32I), > - FORMAT(GL_R32UI), > - FORMAT(GL_RG_INTEGER), > - FORMAT(GL_RG8I), > - FORMAT(GL_RG8UI), > - FORMAT(GL_RG16I), > - FORMAT(GL_RG16UI), > - FORMAT(GL_RG32I), > - FORMAT(GL_RG32UI), > + FORMAT(GL_R8I, GL_RED), > + FORMAT(GL_R8UI, GL_RED), > + FORMAT(GL_R16I, GL_RED), > + FORMAT(GL_R16UI, GL_RED), > + FORMAT(GL_R32I, GL_RED), > + FORMAT(GL_R32UI, GL_RED), > + FORMAT(GL_RG_INTEGER, GL_RG), > + FORMAT(GL_RG8I, GL_RG), > + FORMAT(GL_RG8UI, GL_RG), > + FORMAT(GL_RG16I, GL_RG), > + FORMAT(GL_RG16UI, GL_RG), > + FORMAT(GL_RG32I, GL_RG), > + FORMAT(GL_RG32UI, GL_RG), > }; > > static const struct format_desc arb_texture_rg_float[] = { > - FORMAT(GL_R16F), > - FORMAT(GL_R32F), > - FORMAT(GL_RG16F), > - FORMAT(GL_RG32F), > + FORMAT(GL_R16F, GL_RED), > + FORMAT(GL_R32F, GL_RED), > + FORMAT(GL_RG16F, GL_RG), > + FORMAT(GL_RG32F, GL_RG), > }; > > static const struct format_desc ext_texture_shared_exponent[] = { > - FORMAT(GL_RGB9_E5_EXT), > + FORMAT(GL_RGB9_E5_EXT, GL_RGB), > }; > > static const struct format_desc ext_packed_float[] = { > - FORMAT(GL_R11F_G11F_B10F_EXT), > + FORMAT(GL_R11F_G11F_B10F_EXT, GL_RGB), > }; > > static const struct format_desc arb_depth_buffer_float[] = { > - FORMAT(GL_DEPTH_COMPONENT32F), > - FORMAT(GL_DEPTH32F_STENCIL8), > + FORMAT(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT), > + FORMAT(GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL), > }; > > static const struct format_desc ext_texture_compression_rgtc[] = { > - FORMAT(GL_COMPRESSED_RED), > - FORMAT(GL_COMPRESSED_RED_RGTC1_EXT), > - FORMAT(GL_COMPRESSED_RG), > - FORMAT(GL_COMPRESSED_RED_GREEN_RGTC2_EXT), > + FORMAT(GL_COMPRESSED_RED, GL_RED), > + FORMAT(GL_COMPRESSED_RED_RGTC1_EXT, GL_RED), > + FORMAT(GL_COMPRESSED_RG, GL_RG), > + FORMAT(GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_RG), > }; > > static const struct format_desc ext_texture_compression_rgtc_signed[] = { > - FORMAT(GL_COMPRESSED_SIGNED_RED_RGTC1_EXT), > - FORMAT(GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT), > + FORMAT(GL_COMPRESSED_SIGNED_RED_RGTC1_EXT, GL_RED), > + FORMAT(GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT, GL_RG), > }; > > static const struct format_desc arb_texture_float[] = { > - FORMAT(GL_RGB16F_ARB), > - FORMAT(GL_RGBA16F_ARB), > - FORMAT(GL_ALPHA16F_ARB), > - FORMAT(GL_LUMINANCE16F_ARB), > - FORMAT(GL_LUMINANCE_ALPHA16F_ARB), > - FORMAT(GL_INTENSITY16F_ARB), > - FORMAT(GL_RGB32F_ARB), > - FORMAT(GL_RGBA32F_ARB), > - FORMAT(GL_ALPHA32F_ARB), > - FORMAT(GL_LUMINANCE32F_ARB), > - FORMAT(GL_LUMINANCE_ALPHA32F_ARB), > - FORMAT(GL_INTENSITY32F_ARB) > + FORMAT(GL_RGB16F_ARB, GL_RGB), > + FORMAT(GL_RGBA16F_ARB, GL_RGBA), > + FORMAT(GL_ALPHA16F_ARB, GL_ALPHA), > + FORMAT(GL_LUMINANCE16F_ARB, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE_ALPHA16F_ARB, GL_LUMINANCE_ALPHA), > + FORMAT(GL_INTENSITY16F_ARB, GL_INTENSITY), > + FORMAT(GL_RGB32F_ARB, GL_RGB), > + FORMAT(GL_RGBA32F_ARB, GL_RGBA), > + FORMAT(GL_ALPHA32F_ARB, GL_ALPHA), > + FORMAT(GL_LUMINANCE32F_ARB, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE_ALPHA32F_ARB, GL_LUMINANCE_ALPHA), > + FORMAT(GL_INTENSITY32F_ARB, GL_INTENSITY) > }; > > static const struct format_desc ati_texture_compression_3dc[] = { > - FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI) > + FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_LUMINANCE_ALPHA) > }; > > static const struct format_desc ext_texture_compression_latc[] = { > - FORMAT(GL_COMPRESSED_LUMINANCE_LATC1_EXT), > - FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT), > + FORMAT(GL_COMPRESSED_LUMINANCE_LATC1_EXT, GL_LUMINANCE), > + FORMAT(GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT, GL_LUMINANCE_ALPHA), > }; > > static const struct format_desc ext_texture_compression_latc_signed[] = { > - FORMAT(GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT), > - FORMAT(GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT) > + FORMAT(GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT, GL_LUMINANCE), > + FORMAT(GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT, > GL_LUMINANCE_ALPHA) > }; > > static const struct format_desc ext_texture_snorm[] = { > - FORMAT(GL_RED_SNORM), > - FORMAT(GL_R8_SNORM), > - FORMAT(GL_RG_SNORM), > - FORMAT(GL_RG8_SNORM), > - FORMAT(GL_RGB_SNORM), > - FORMAT(GL_RGB8_SNORM), > - FORMAT(GL_RGBA_SNORM), > - FORMAT(GL_RGBA8_SNORM), > - FORMAT(GL_ALPHA_SNORM), > - FORMAT(GL_ALPHA8_SNORM), > - FORMAT(GL_LUMINANCE_SNORM), > - FORMAT(GL_LUMINANCE8_SNORM), > - FORMAT(GL_LUMINANCE_ALPHA_SNORM), > - FORMAT(GL_LUMINANCE8_ALPHA8_SNORM), > - FORMAT(GL_INTENSITY_SNORM), > - FORMAT(GL_INTENSITY8_SNORM), > - FORMAT(GL_R16_SNORM), > - FORMAT(GL_RG16_SNORM), > - FORMAT(GL_RGB16_SNORM), > - FORMAT(GL_RGBA16_SNORM), > - FORMAT(GL_ALPHA16_SNORM), > - FORMAT(GL_LUMINANCE16_SNORM), > - FORMAT(GL_LUMINANCE16_ALPHA16_SNORM), > - FORMAT(GL_INTENSITY16_SNORM) > + FORMAT(GL_RED_SNORM, GL_RED), > + FORMAT(GL_R8_SNORM, GL_RED), > + FORMAT(GL_RG_SNORM, GL_RG), > + FORMAT(GL_RG8_SNORM, GL_RG), > + FORMAT(GL_RGB_SNORM, GL_RG), > + FORMAT(GL_RGB8_SNORM, GL_RGB), > + FORMAT(GL_RGBA_SNORM, GL_RGBA), > + FORMAT(GL_RGBA8_SNORM, GL_RGBA), > + FORMAT(GL_ALPHA_SNORM, GL_ALPHA), > + FORMAT(GL_ALPHA8_SNORM, GL_ALPHA), > + FORMAT(GL_LUMINANCE_SNORM, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE8_SNORM, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE_ALPHA_SNORM, GL_LUMINANCE_ALPHA), > + FORMAT(GL_LUMINANCE8_ALPHA8_SNORM, GL_LUMINANCE_ALPHA), > + FORMAT(GL_INTENSITY_SNORM, GL_INTENSITY), > + FORMAT(GL_INTENSITY8_SNORM, GL_INTENSITY), > + FORMAT(GL_R16_SNORM, GL_RED), > + FORMAT(GL_RG16_SNORM, GL_RG), > + FORMAT(GL_RGB16_SNORM, GL_RGB), > + FORMAT(GL_RGBA16_SNORM, GL_RGBA), > + FORMAT(GL_ALPHA16_SNORM, GL_ALPHA), > + FORMAT(GL_LUMINANCE16_SNORM, GL_LUMINANCE), > + FORMAT(GL_LUMINANCE16_ALPHA16_SNORM, GL_LUMINANCE_ALPHA), > + FORMAT(GL_INTENSITY16_SNORM, GL_INTENSITY) > }; > > struct test_desc { > -- > 1.7.7.6 > > _______________________________________________ > Piglit mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit
Reviewed-by: Anuj Phogat <[email protected]> _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
