@ -31,6 +31,7 @@
# define NO_SWIZZLE { SWIZZLE_INVALID, SWIZZLE_INVALID, SWIZZLE_INVALID, SWIZZLE_INVALID }
# define RRR1_SWIZZLE { PIPE_SWIZZLE_RED, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_ONE }
# define RGB1_SWIZZLE { PIPE_SWIZZLE_RED, PIPE_SWIZZLE_GREEN, PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_ONE }
# define OOOR_SWIZZLE { PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_RED }
# define BGR1_SWIZZLE { PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_GREEN, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_ONE }
# define BGRA_SWIZZLE { PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_GREEN, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_ALPHA }
@ -131,11 +132,11 @@ static struct vrend_format_table float_base_formats[] = {
} ;
static struct vrend_format_table float_la_formats [ ] = {
{ VIRGL_FORMAT_A16_FLOAT , GL_ALPHA16F_ARB , GL_ALPHA , GL_HALF_FLOAT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A16_FLOAT , GL_R16F , GL_RED , GL_HALF_FLOAT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L16_FLOAT , GL_R16F , GL_RED , GL_HALF_FLOAT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L16A16_FLOAT , GL_LUMINANCE_ALPHA16F_ARB , GL_LUMINANCE_ALPHA , GL_HALF_FLOAT , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A32_FLOAT , GL_ALPHA32F_ARB , GL_ALPHA , GL_FLOAT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A32_FLOAT , GL_R32F , GL_RED , GL_FLOAT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L32_FLOAT , GL_R32F , GL_RED , GL_FLOAT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L32A32_FLOAT , GL_LUMINANCE_ALPHA32F_ARB , GL_LUMINANCE_ALPHA , GL_FLOAT , NO_SWIZZLE } ,
} ;
@ -171,26 +172,26 @@ static struct vrend_format_table float_3comp_formats[] = {
static struct vrend_format_table integer_la_formats [ ] = {
{ VIRGL_FORMAT_A8_UINT , GL_ALPHA8UI_EXT , GL_ALPHA _INTEGER , GL_UNSIGNED_BYTE , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A8_UINT , GL_R8UI , GL_RED _INTEGER , GL_UNSIGNED_BYTE , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L8_UINT , GL_R8UI , GL_RED_INTEGER , GL_UNSIGNED_BYTE , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L8A8_UINT , GL_LUMINANCE_ALPHA8UI_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_UNSIGNED_BYTE , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A8_SINT , GL_ALPHA8I_EXT , GL_ALPHA _INTEGER , GL_BYTE , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A8_SINT , GL_R8I , GL_RED _INTEGER , GL_BYTE , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L8_SINT , GL_R8I , GL_RED_INTEGER , GL_BYTE , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L8A8_SINT , GL_LUMINANCE_ALPHA8I_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_BYTE , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A16_UINT , GL_ALPHA16UI_EXT , GL_ALPHA _INTEGER , GL_UNSIGNED_SHORT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A16_UINT , GL_R16UI , GL_RED _INTEGER , GL_UNSIGNED_SHORT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L16_UINT , GL_R16UI , GL_RED_INTEGER , GL_UNSIGNED_SHORT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L16A16_UINT , GL_LUMINANCE_ALPHA16UI_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_UNSIGNED_SHORT , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A16_SINT , GL_ALPHA16I_EXT , GL_ALPHA _INTEGER , GL_SHORT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A16_SINT , GL_R16I , GL_RED _INTEGER , GL_SHORT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L16_SINT , GL_R16I , GL_RED_INTEGER , GL_SHORT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L16A16_SINT , GL_LUMINANCE_ALPHA16I_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_SHORT , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A32_UINT , GL_ALPHA32UI_EXT , GL_ALPHA _INTEGER , GL_UNSIGNED_INT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A32_UINT , GL_R32UI , GL_RED _INTEGER , GL_UNSIGNED_INT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L32_UINT , GL_R32UI , GL_RED_INTEGER , GL_UNSIGNED_INT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L32A32_UINT , GL_LUMINANCE_ALPHA32UI_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_UNSIGNED_INT , NO_SWIZZLE } ,
{ VIRGL_FORMAT_A32_SINT , GL_ALPHA32I_EXT , GL_ALPHA _INTEGER , GL_INT , NO _SWIZZLE } ,
{ VIRGL_FORMAT_A32_SINT , GL_R32I , GL_RED _INTEGER , GL_INT , OOOR _SWIZZLE } ,
{ VIRGL_FORMAT_L32_SINT , GL_R32I , GL_RED_INTEGER , GL_INT , RRR1_SWIZZLE } ,
{ VIRGL_FORMAT_L32A32_SINT , GL_LUMINANCE_ALPHA32I_EXT , GL_LUMINANCE_ALPHA_INTEGER_EXT , GL_INT , NO_SWIZZLE } ,