[PATCH 1/5] wined3d: Get rid of the SHADER_PGMSIZE constant.

Henri Verbeet hverbeet at codeweavers.com
Thu Aug 29 03:26:23 CDT 2013


---
 dlls/wined3d/shader.c          | 5 ++---
 dlls/wined3d/wined3d_private.h | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 786d491..624d091 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -245,13 +245,12 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer)
 
 BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer)
 {
-    buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE);
-    if (!buffer->buffer)
+    buffer->buffer_size = 16384;
+    if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size)))
     {
         ERR("Failed to allocate shader buffer memory.\n");
         return FALSE;
     }
-    buffer->buffer_size = SHADER_PGMSIZE;
 
     shader_buffer_clear(buffer);
     return TRUE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c320b65..ee90b67 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -412,8 +412,6 @@ enum wined3d_shader_rel_op
  * Shader model 3 according to msdn (and for software shaders) */
 #define MAX_LABELS 16
 
-#define SHADER_PGMSIZE 16384
-
 struct wined3d_shader_buffer
 {
     char *buffer;
-- 
1.8.1.5




More information about the wine-patches mailing list