diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
| commit | 22fb212bb84a69ab20a494aed1c197da1d2dbdf7 (patch) | |
| tree | d11c21c9260bee0f56c34ee6e241671befd5257f /mesalib/src/mesa/main/formats.c | |
| parent | c1296df0ebe19a8e90fb7d7f0135d7034f16a76d (diff) | |
| parent | 7417e9a171736b5279881cd4381fb58c617a23d9 (diff) | |
| download | vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.gz vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.bz2 vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/formats.c')
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index b934bd4d8..b9871aec8 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -123,6 +123,24 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] = 1, 1, 4 /* BlockWidth/Height,Bytes */ }, { + MESA_FORMAT_RGBX8888, /* Name */ + "MESA_FORMAT_RGBX8888", /* StrName */ + GL_RGB, /* BaseFormat */ + GL_UNSIGNED_NORMALIZED, /* DataType */ + 8, 8, 8, 0, /* Red/Green/Blue/AlphaBits */ + 0, 0, 0, 0, 0, /* Lum/Int/Index/Depth/StencilBits */ + 1, 1, 4 /* BlockWidth/Height,Bytes */ + }, + { + MESA_FORMAT_RGBX8888_REV, /* Name */ + "MESA_FORMAT_RGBX8888_REV", /* StrName */ + GL_RGB, /* BaseFormat */ + GL_UNSIGNED_NORMALIZED, /* DataType */ + 8, 8, 8, 0, /* Red/Green/Blue/AlphaBits */ + 0, 0, 0, 0, 0, /* Lum/Int/Index/Depth/StencilBits */ + 1, 1, 4 /* BlockWidth/Height,Bytes */ + }, + { MESA_FORMAT_XRGB8888, /* Name */ "MESA_FORMAT_XRGB8888", /* StrName */ GL_RGB, /* BaseFormat */ @@ -1987,6 +2005,8 @@ _mesa_format_to_type_and_comps(gl_format format, case MESA_FORMAT_RGBA8888_REV: case MESA_FORMAT_ARGB8888: case MESA_FORMAT_ARGB8888_REV: + case MESA_FORMAT_RGBX8888: + case MESA_FORMAT_RGBX8888_REV: case MESA_FORMAT_XRGB8888: case MESA_FORMAT_XRGB8888_REV: *datatype = GL_UNSIGNED_BYTE; @@ -2492,6 +2512,10 @@ _mesa_format_matches_format_and_type(gl_format gl_format, return ((format == GL_BGRA && (type == GL_UNSIGNED_INT_8_8_8_8 || (type == GL_UNSIGNED_BYTE && !littleEndian)))); + case MESA_FORMAT_RGBX8888: + case MESA_FORMAT_RGBX8888_REV: + return GL_FALSE; + case MESA_FORMAT_XRGB8888: case MESA_FORMAT_XRGB8888_REV: return GL_FALSE; |