Henri Verbeet : wined3d: Create a separate function for setting basic format info.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1407bd6b1aba4c84c0f5d8b3b5da43a029f47670
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1407bd6b1aba4c84c0f5d8b3b5da43a029f47670

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Mar 27 10:25:54 2009 +0100

wined3d: Create a separate function for setting basic format info.

---

 dlls/wined3d/utils.c |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index e36b439..e63fd60 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -375,7 +375,7 @@ static inline int getFmtIdx(WINED3DFORMAT fmt) {
     return -1;
 }
 
-BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info)
+static BOOL init_format_base_info(WineD3D_GL_Info *gl_info)
 {
     UINT format_count = sizeof(formats) / sizeof(*formats);
     UINT i;
@@ -404,15 +404,18 @@ BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info)
     return TRUE;
 }
 
+BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info)
+{
+    return init_format_base_info(gl_info);
+}
+
 #define GLINFO_LOCATION (*gl_info)
 BOOL initPixelFormats(WineD3D_GL_Info *gl_info)
 {
     unsigned int src;
     int dst;
 
-    gl_info->gl_formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-                                    sizeof(formats) / sizeof(formats[0]) * sizeof(gl_info->gl_formats[0]));
-    if(!gl_info->gl_formats) return FALSE;
+    if (!init_format_base_info(gl_info)) return FALSE;
 
     /* If a format depends on some extensions, remove them from the table above and initialize them
      * after this loop
@@ -422,16 +425,6 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info)
         dst = getFmtIdx(gl_formats_template[src].fmt);
         desc = &gl_info->gl_formats[dst];
 
-        desc->format = formats[dst].format;
-        desc->red_mask = formats[dst].redMask;
-        desc->green_mask = formats[dst].greenMask;
-        desc->blue_mask = formats[dst].blueMask;
-        desc->alpha_mask = formats[dst].alphaMask;
-        desc->byte_count = formats[dst].bpp;
-        desc->depth_size = formats[dst].depthSize;
-        desc->stencil_size = formats[dst].stencilSize;
-        if (formats[dst].isFourcc) desc->Flags |= WINED3DFMT_FLAG_FOURCC;
-
         desc->glInternal = gl_formats_template[src].glInternal;
         desc->glGammaInternal = gl_formats_template[src].glGammaInternal;
         desc->glFormat = gl_formats_template[src].glFormat;