wined3d: Fix WINED3DFMT_A4L4.
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 9e988e5..7b9d92e 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5153,6 +5153,9 @@
int offset = 0;
int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */
glDescriptor *glDescription = NULL;
+ GLenum dummy;
+ int bpp;
+ CONVERT_TYPES convert = NO_CONVERSION;
WINED3DSURFACE_DESC winedesc;
@@ -5178,6 +5181,19 @@
return WINED3DERR_INVALIDCALL;
}
+ /* This call loads the opengl surface directly, instead of copying the surface to the
+ * destination's sysmem copy. If surface conversion is needed, use BltFast instead to
+ * copy in sysmem and use regular surface loading.
+ */
+ d3dfmt_get_conv((IWineD3DSurfaceImpl *) pDestinationSurface, FALSE, TRUE,
+ &dummy, &dummy, &dummy, &convert, &bpp, FALSE);
+ if(convert != NO_CONVERSION) {
+ return IWineD3DSurface_BltFast(pDestinationSurface,
+ pDestPoint ? pDestPoint->x : 0,
+ pDestPoint ? pDestPoint->y : 0,
+ pSourceSurface, (RECT *) pSourceRect, 0);
+ }
+
if (destFormat == WINED3DFMT_UNKNOWN) {
TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", This);
IWineD3DSurface_SetFormat(pDestinationSurface, srcFormat);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 464e5c8..5ba1dec 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -32,26 +32,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info
-typedef enum {
- NO_CONVERSION,
- CONVERT_PALETTED,
- CONVERT_PALETTED_CK,
- CONVERT_CK_565,
- CONVERT_CK_5551,
- CONVERT_CK_4444,
- CONVERT_CK_4444_ARGB,
- CONVERT_CK_1555,
- CONVERT_555,
- CONVERT_CK_RGB24,
- CONVERT_CK_8888,
- CONVERT_CK_8888_ARGB,
- CONVERT_RGB32_888,
- CONVERT_V8U8,
- CONVERT_X8L8V8U8,
- CONVERT_Q8W8V8U8,
- CONVERT_V16U16
-} CONVERT_TYPES;
-
HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf);
static void surface_download_data(IWineD3DSurfaceImpl *This) {
@@ -1484,7 +1464,7 @@
IWineD3DSurface Internal (No mapping to directx api) parts follow
****************************************************** */
-static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode) {
+HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode) {
BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT);
const GlPixelFormatDesc *glDesc;
getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc);
@@ -1615,6 +1595,18 @@
*/
break;
+ case WINED3DFMT_A4L4:
+ /* A4L4 exists as an internal gl format, but for some reason there is not
+ * format+type combination to load it. Thus convert it to A8L8, then load it
+ * with A4L4 internal, but A8L8 format+type
+ */
+ *convert = CONVERT_A4L4;
+ *format = GL_LUMINANCE_ALPHA;
+ *internal = GL_LUMINANCE4_ALPHA4;
+ *type = GL_UNSIGNED_BYTE;
+ *target_bpp = 2;
+ break;
+
default:
break;
}
@@ -1801,6 +1793,23 @@
break;
}
+ case CONVERT_A4L4:
+ {
+ unsigned int x, y;
+ unsigned char *Source;
+ unsigned char *Dest;
+ for(y = 0; y < height; y++) {
+ Source = (unsigned char *) (src + y * pitch);
+ Dest = (unsigned char *) (dst + y * outpitch);
+ for (x = 0; x < width; x++ ) {
+ unsigned char color = (*Source++);
+ /* A */ Dest[1] = (color & 0xf0) << 0;
+ /* L */ Dest[0] = (color & 0x0f) << 4;
+ Dest += 2;
+ }
+ }
+ break;
+ }
default:
ERR("Unsupported conversation type %d\n", convert);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 445ecea..7a9170a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1220,6 +1220,29 @@
BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]);
+typedef enum {
+ NO_CONVERSION,
+ CONVERT_PALETTED,
+ CONVERT_PALETTED_CK,
+ CONVERT_CK_565,
+ CONVERT_CK_5551,
+ CONVERT_CK_4444,
+ CONVERT_CK_4444_ARGB,
+ CONVERT_CK_1555,
+ CONVERT_555,
+ CONVERT_CK_RGB24,
+ CONVERT_CK_8888,
+ CONVERT_CK_8888_ARGB,
+ CONVERT_RGB32_888,
+ CONVERT_V8U8,
+ CONVERT_X8L8V8U8,
+ CONVERT_Q8W8V8U8,
+ CONVERT_V16U16,
+ CONVERT_A4L4
+} CONVERT_TYPES;
+
+HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);
+
/*****************************************************************************
* IWineD3DVertexDeclaration implementation structure
*/
