Changeset 22321 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 18, 2009 11:32:24 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51207

Message:

crOpenGL: wine proper change for snprintf/_snprintf etc.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• baseshader.c (modified) (2 diffs)
• glsl_shader.c (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/baseshader.c

@@ -35 +35 @@
 
 #include "config.h"
+#include "wine/port.h"
 #include <string.h>
 #include <stdio.h>
@@ -179 +180 @@
     int rc;
 
-    rc = _vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args);
+    rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args);
 
     if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c

@@ -40 +40 @@
 
 #include "config.h"
+#include "wine/port.h"
 #include <limits.h>
 #include <stdio.h>
@@ -260 +261 @@
 
     for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) {
-        _snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i);
+        snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i);
         name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name));
         if (name_loc != -1) {
@@ -285 +286 @@
 
     for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) {
-        _snprintf(sampler_name, sizeof(sampler_name), "Vsampler%d", i);
+        snprintf(sampler_name, sizeof(sampler_name), "Vsampler%d", i);
         name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name));
         if (name_loc != -1) {
@@ -548 +549 @@
         /* TODO: Benchmark and see if it would be beneficial to store the
          * locations of the constants to avoid looking up each time */
-        _snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i);
+        snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i);
         tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));
         if (tmp_loc != -1)
@@ -567 +568 @@
         TRACE_(d3d_constants)("Loading local constants %i: %i\n", idx, values[0]);
 
-        _snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx);
+        snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx);
         tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));
         if (tmp_loc != -1) {
@@ -3696 +3697 @@
     LIST_FOR_EACH_ENTRY(lconst, &shader->baseShader.constantsF, local_constant, entry) {
         value = (const float *)lconst->value;
-        _snprintf(glsl_name, sizeof(glsl_name), "%cLC%u", prefix, lconst->idx);
+        snprintf(glsl_name, sizeof(glsl_name), "%cLC%u", prefix, lconst->idx);
         tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name));
         GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, value));
@@ -4077 +4078 @@
             if (!(map & 1)) continue;
 
-            _snprintf(tmp_name, sizeof(tmp_name), "attrib%u", i);
+            snprintf(tmp_name, sizeof(tmp_name), "attrib%u", i);
             GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name));
         }
@@ -4104 +4105 @@
     entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vshader_constantsF));
     for (i = 0; i < GL_LIMITS(vshader_constantsF); ++i) {
-        _snprintf(glsl_name, sizeof(glsl_name), "VC[%i]", i);
+        snprintf(glsl_name, sizeof(glsl_name), "VC[%i]", i);
         entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name));
     }
     for (i = 0; i < MAX_CONST_I; ++i) {
-        _snprintf(glsl_name, sizeof(glsl_name), "VI[%i]", i);
+        snprintf(glsl_name, sizeof(glsl_name), "VI[%i]", i);
         entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name));
     }
     entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(pshader_constantsF));
     for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) {
-        _snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i);
+        snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i);
         entry->puniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name));
     }
     for (i = 0; i < MAX_CONST_I; ++i) {
-        _snprintf(glsl_name, sizeof(glsl_name), "PI[%i]", i);
+        snprintf(glsl_name, sizeof(glsl_name), "PI[%i]", i);
         entry->puniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name));
     }