Changeset 1251Tweet

Timestamp:

Apr 21, 2012, 5:01:04 PM (9 years ago)

Author:

sam

Message:

gpu: fix a stupid signed/unsigned inconsistency causing vertex declaration
creation failures.

Location:

trunk/src/gpu

Files:

• vertexbuffer.cpp (modified) (1 diff)
• vertexbuffer.h (modified) (1 diff)

trunk/src/gpu/vertexbuffer.cpp

@@ -319 +319 @@
         X, D3DDECLTYPE_USHORT2N, X, D3DDECLTYPE_USHORT4N, /* uint16_t */
         X, X, X, X, /* int32_t */
-        X, X, X, X, /* int64_t */
+        X, X, X, X, /* uint32_t */
     };
     static D3DDECLUSAGE const ulut[] =

trunk/src/gpu/vertexbuffer.h

@@ -85 +85 @@
         Typefloat,    Typevec2,    Typevec3,    Typevec4,
         Typedouble,   Typef64vec2, Typef64vec3, Typef64vec4,
+        Typeint8_t,   Typei8vec2,  Typei8vec3,  Typei8vec4,
         Typeuint8_t,  Typeu8vec2,  Typeu8vec3,  Typeu8vec4,
-        Typeint8_t,   Typei8vec2,  Typei8vec3,  Typei8vec4,
+        Typeint16_t,  Typei16vec2, Typei16vec3, Typei16vec4,
         Typeuint16_t, Typeu16vec2, Typeu16vec3, Typeu16vec4,
-        Typeint16_t,  Typei16vec2, Typei16vec3, Typei16vec4,
+        Typeint32_t,  Typeivec2,   Typeivec3,   Typeivec4,
         Typeuint32_t, Typeuvec2,   Typeuvec3,   Typeuvec4,
-        Typeint32_t,  Typeivec2,   Typeivec3,   Typeivec4,
     };