diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
| commit | 6f066fc9e28c33779b89e7e48e6437965dde9b77 (patch) | |
| tree | b2b9767762bd559d1edd808820cb65a4e3330397 /mesalib/src/mesa/main | |
| parent | 1b73fdf9c9aa2330380300d204fb47f512cfb6e2 (diff) | |
| parent | 5fb4fb602bde5140dcea45464e3b70a49078ad2e (diff) | |
| download | vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.gz vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.bz2 vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/enums.c | 7 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texstore.c | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c index b00a738bc..c92a9a166 100644 --- a/mesalib/src/mesa/main/enums.c +++ b/mesalib/src/mesa/main/enums.c @@ -4460,7 +4460,7 @@ static const enum_elt all_enums[2340] = { 45645, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ { 45676, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */ { 45711, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */ - { 45746, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ + { 45746, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ { 45775, 0x00008071 }, /* GL_TEXTURE_DEPTH */ { 45792, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */ { 45814, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */ @@ -4723,7 +4723,7 @@ static const enum_elt all_enums[2340] = { 52477, 0x00000D17 }, /* GL_ZOOM_Y */ }; -static const unsigned reduced_enums[1571] = +static const unsigned reduced_enums[1572] = { 556, /* GL_FALSE */ 853, /* GL_LINES */ @@ -5806,6 +5806,7 @@ static const unsigned reduced_enums[1571] = 2038, /* GL_TEXTURE_COMPARE_MODE */ 2036, /* GL_TEXTURE_COMPARE_FUNC */ 284, /* GL_COMPARE_REF_TO_TEXTURE */ + 2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ 1400, /* GL_POINT_SPRITE */ 347, /* GL_COORD_REPLACE */ 1405, /* GL_POINT_SPRITE_R_MODE_NV */ @@ -5917,7 +5918,7 @@ static const unsigned reduced_enums[1571] = 1368, /* GL_PIXEL_UNPACK_BUFFER_BINDING */ 400, /* GL_DEPTH24_STENCIL8 */ 2134, /* GL_TEXTURE_STENCIL_SIZE */ - 2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ + 1096, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ 1094, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ 1097, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ 1101, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c index 8c51a948e..e8190c392 100644 --- a/mesalib/src/mesa/main/texstore.c +++ b/mesalib/src/mesa/main/texstore.c @@ -1350,6 +1350,32 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS) } else if (!ctx->_ImageTransferState && !srcPacking->SwapBytes && + dstFormat == MESA_FORMAT_ARGB8888 && + srcFormat == GL_LUMINANCE_ALPHA && + baseInternalFormat == GL_RGBA && + srcType == GL_UNSIGNED_BYTE) { + /* special case of storing LA -> ARGB8888 */ + int img, row, col; + const GLint srcRowStride = + _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType); + for (img = 0; img < srcDepth; img++) { + const GLubyte *srcRow = (const GLubyte *) + _mesa_image_address(dims, srcPacking, srcAddr, srcWidth, + srcHeight, srcFormat, srcType, img, 0, 0); + GLubyte *dstRow = dstSlices[img]; + for (row = 0; row < srcHeight; row++) { + GLuint *d4 = (GLuint *) dstRow; + for (col = 0; col < srcWidth; col++) { + GLubyte l = srcRow[col * 2 + 0], a = srcRow[col * 2 + 1]; + d4[col] = PACK_COLOR_8888(a, l, l, l); + } + dstRow += dstRowStride; + srcRow += srcRowStride; + } + } + } + else if (!ctx->_ImageTransferState && + !srcPacking->SwapBytes && dstFormat == MESA_FORMAT_ARGB8888 && srcFormat == GL_RGBA && baseInternalFormat == GL_RGBA && |