commit ef2d70418383f03c6bf701caeb67129acc6d2453
author Henri Verbeet <hverbeet@codeweavers.com> Mon Mar 30 11:24:54 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 30 15:11:24 2009 +0200
tree 73896050acf1d4ee84678ec41d31485d88b76a6b
parent 8968f5fa0908376f690a55802eae48d4c5dcd1c3

wined3d: Store the format_desc itself in struct wined3d_stream_info_element.

dlls/wined3d/wined3d_private.h

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 36430ec..fdd28da 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -584,7 +584,7 @@
 /* Trace vector and strided data information */
 #define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w);
 #define TRACE_STRIDED(si, name) TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \
-        si->elements[name].data, si->elements[name].stride, si->elements[name].d3d_format, \
+        si->elements[name].data, si->elements[name].stride, si->elements[name].format_desc->format, \
         si->elements[name].buffer_object, si->elements[name].stream_idx);
 
 /* Defines used for optimizations */
@@ -686,15 +686,9 @@
 
 struct wined3d_stream_info_element
 {
-    WINED3DFORMAT d3d_format;
-    enum wined3d_ffp_emit_idx emit_idx;
-    GLint size;
-    GLint format;
-    GLenum type;
+    const struct GlPixelFormatDesc *format_desc;
     GLsizei stride;
-    GLboolean normalized;
     const BYTE *data;
-    int type_size;
     UINT stream_idx;
     GLuint buffer_object;
 };