Stefan Dösinger : wined3d: Revert the GL usage confusion.

Alexandre Julliard julliard at winehq.org
Mon Jan 4 10:54:18 CST 2010


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Thu Dec 17 18:11:20 2009 +0100

wined3d: Revert the GL usage confusion.

This is functionally a revert of
8eeb513b1a0e7a4f7963612f0305850499c9ec7d. The language of the extension
is slightly confusing to me, but GL_STREAM_*_ARB is more dynamic than
GL_DYNAMIC_*_ARB. So use GL_STREAM usage for D3DUSAGE_DYNAMIC buffers and
GL_DYNAMIC usage for non-dynamic buffers.

---

 dlls/wined3d/buffer.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 51e594d..c5b8b44 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -85,13 +85,13 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This)
      */
     if(This->resource.usage & WINED3DUSAGE_DYNAMIC)
     {
-        TRACE("Gl usage = GL_DYNAMIC_DRAW\n");
-        gl_usage = GL_DYNAMIC_DRAW_ARB;
+        TRACE("Gl usage = GL_STREAM_DRAW_ARB\n");
+        gl_usage = GL_STREAM_DRAW_ARB;
     }
     else
     {
-        TRACE("Gl usage = GL_STREAM_DRAW\n");
-        gl_usage = GL_STREAM_DRAW_ARB;
+        TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n");
+        gl_usage = GL_DYNAMIC_DRAW_ARB;
     }
 
     /* Reserve memory for the buffer. The amount of data won't change




More information about the wine-cvs mailing list