X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fglx%2Fcompsize.c;h=805591914c5cdce03d7dbb931e70df3c3e76a83b;hp=5ba6dc919e5ec2bc1b34159f3df40bee8f9e8b5c;hb=97d58eabcc87d9b66b5837eeae0ce1174d29f448;hpb=653a83445f94620673f747a4ace6847a2c7fdb4d

diff --git a/src/glx/compsize.c b/src/glx/compsize.c
index 5ba6dc919e5..805591914c5 100644
--- a/src/glx/compsize.c
+++ b/src/glx/compsize.c
@@ -52,15 +52,11 @@ __glElementsPerGroup(GLenum format, GLenum type)
    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
    case GL_UNSIGNED_SHORT_8_8_APPLE:
    case GL_UNSIGNED_SHORT_8_8_REV_APPLE:
-   case GL_UNSIGNED_SHORT_15_1_MESA:
-   case GL_UNSIGNED_SHORT_1_15_REV_MESA:
    case GL_UNSIGNED_INT_8_8_8_8:
    case GL_UNSIGNED_INT_8_8_8_8_REV:
    case GL_UNSIGNED_INT_10_10_10_2:
    case GL_UNSIGNED_INT_2_10_10_10_REV:
    case GL_UNSIGNED_INT_24_8_NV:
-   case GL_UNSIGNED_INT_24_8_MESA:
-   case GL_UNSIGNED_INT_8_24_REV_MESA:
       return 1;
    default:
       break;
@@ -69,17 +65,24 @@ __glElementsPerGroup(GLenum format, GLenum type)
    switch (format) {
    case GL_RGB:
    case GL_BGR:
+   case GL_RGB_INTEGER_EXT:
+   case GL_BGR_INTEGER_EXT:
       return 3;
+   case GL_RG:
    case GL_422_EXT:
    case GL_422_REV_EXT:
    case GL_422_AVERAGE_EXT:
    case GL_422_REV_AVERAGE_EXT:
+   case GL_DEPTH_STENCIL_NV:
    case GL_YCBCR_422_APPLE:
    case GL_LUMINANCE_ALPHA:
+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
       return 2;
    case GL_RGBA:
    case GL_BGRA:
    case GL_ABGR_EXT:
+   case GL_RGBA_INTEGER_EXT:
+   case GL_BGRA_INTEGER_EXT:
       return 4;
    case GL_COLOR_INDEX:
    case GL_STENCIL_INDEX:
@@ -90,6 +93,11 @@ __glElementsPerGroup(GLenum format, GLenum type)
    case GL_ALPHA:
    case GL_LUMINANCE:
    case GL_INTENSITY:
+   case GL_RED_INTEGER_EXT:
+   case GL_GREEN_INTEGER_EXT:
+   case GL_BLUE_INTEGER_EXT:
+   case GL_ALPHA_INTEGER_EXT:
+   case GL_LUMINANCE_INTEGER_EXT:
       return 1;
    default:
       return 0;
@@ -114,8 +122,6 @@ __glBytesPerElement(GLenum type)
    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
    case GL_UNSIGNED_SHORT_8_8_APPLE:
    case GL_UNSIGNED_SHORT_8_8_REV_APPLE:
-   case GL_UNSIGNED_SHORT_15_1_MESA:
-   case GL_UNSIGNED_SHORT_1_15_REV_MESA:
       return 2;
    case GL_UNSIGNED_BYTE:
    case GL_BYTE:
@@ -130,8 +136,6 @@ __glBytesPerElement(GLenum type)
    case GL_UNSIGNED_INT_10_10_10_2:
    case GL_UNSIGNED_INT_2_10_10_10_REV:
    case GL_UNSIGNED_INT_24_8_NV:
-   case GL_UNSIGNED_INT_24_8_MESA:
-   case GL_UNSIGNED_INT_8_24_REV_MESA:
       return 4;
    default:
       return 0;