Move D3D9 vertex format tables to formatutils9.

src/libGLESv2/formatutils.h

@@ -33,7 +33,6 @@ typedef void (*ColorCopyFunction)(const void *source, void *dest);
 
 typedef void (*VertexCopyFunction)(const void *input, size_t stride, size_t count, void *output);
 
-
 namespace rx
 {
 

src/libGLESv2/renderer/d3d9/Renderer9.cpp

@@ -490,6 +490,8 @@ EGLint Renderer9::initialize()
 
     initializeDevice();
 
+    d3d9::InitializeVertexTranslations(this);
+
     return EGL_SUCCESS;
 }
 

src/libGLESv2/renderer/d3d9/VertexBuffer9.h

@@ -33,8 +33,6 @@ class VertexBuffer9 : public VertexBuffer
     virtual bool requiresConversion(const gl::VertexAttribute &attrib) const;
     virtual bool requiresConversion(const gl::VertexAttribCurrentValueData &currentValue) const;
 
-    D3DDECLTYPE getDeclType(const gl::VertexAttribute &attrib) const;
-
     virtual unsigned int getBufferSize() const;
     virtual bool setBufferSize(unsigned int size);
     virtual bool discard();
@@ -50,38 +48,6 @@ class VertexBuffer9 : public VertexBuffer
     unsigned int mBufferSize;
     bool mDynamicUsage;
 
-    // Attribute format conversion
-    enum { NUM_GL_VERTEX_ATTRIB_TYPES = 6 };
-
-    struct FormatConverter
-    {
-        bool identity;
-        std::size_t outputElementSize;
-        void (*convertArray)(const void *in, std::size_t stride, std::size_t n, void *out);
-        D3DDECLTYPE d3dDeclType;
-    };
-
-    static bool mTranslationsInitialized;
-    static void initializeTranslations(DWORD declTypes);
-
-    // [GL types as enumerated by typeIndex()][normalized][size - 1]
-    static FormatConverter mFormatConverters[NUM_GL_VERTEX_ATTRIB_TYPES][2][4];
-
-    struct TranslationDescription
-    {
-        DWORD capsFlag;
-        FormatConverter preferredConversion;
-        FormatConverter fallbackConversion;
-    };
-
-    // This table is used to generate mFormatConverters.
-    // [GL types as enumerated by typeIndex()][normalized][size - 1]
-    static const TranslationDescription mPossibleTranslations[NUM_GL_VERTEX_ATTRIB_TYPES][2][4];
-
-    static unsigned int typeIndex(GLenum type);
-    static const FormatConverter &formatConverter(const gl::VertexAttribute &attribute);
-    static const FormatConverter &getCurrentValueFormatConverter();
-
     static bool spaceRequired(const gl::VertexAttribute &attrib, std::size_t count, GLsizei instances,
                               unsigned int *outSpaceRequired);
 };

src/libGLESv2/renderer/d3d9/VertexDeclarationCache.cpp

@@ -11,6 +11,7 @@
 #include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/d3d9/VertexBuffer9.h"
 #include "libGLESv2/renderer/d3d9/VertexDeclarationCache.h"
+#include "libGLESv2/renderer/d3d9/formatutils9.h"
 
 namespace rx
 {
@@ -131,9 +132,11 @@ GLenum VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device, Transl
                 mAppliedVBs[stream].offset = attributes[i].offset;
             }
 
+            gl::VertexFormat vertexFormat(*attributes[i].attribute, GL_FLOAT);
+
             element->Stream = stream;
             element->Offset = 0;
-            element->Type = vertexBuffer->getDeclType(*attributes[i].attribute);
+            element->Type = d3d9::GetNativeVertexFormat(vertexFormat);
             element->Method = D3DDECLMETHOD_DEFAULT;
             element->Usage = D3DDECLUSAGE_TEXCOORD;
             element->UsageIndex = programBinary->getSemanticIndex(i);

src/libGLESv2/renderer/d3d9/formatutils9.h

@@ -37,6 +37,17 @@ const D3DFormatSet &GetAllUsedD3DFormats();
 ColorReadFunction GetColorReadFunction(D3DFORMAT format);
 ColorCopyFunction GetFastCopyFunction(D3DFORMAT sourceFormat, GLenum destFormat, GLenum destType, GLuint clientVersion);
 
+VertexCopyFunction GetVertexCopyFunction(const gl::VertexFormat &vertexFormat);
+size_t GetVertexElementSize(const gl::VertexFormat &vertexFormat);
+VertexConversionType GetVertexConversionType(const gl::VertexFormat &vertexFormat);
+D3DDECLTYPE GetNativeVertexFormat(const gl::VertexFormat &vertexFormat);
+
+GLenum GetDeclTypeComponentType(D3DDECLTYPE declType);
+int GetDeclTypeComponentCount(D3DDECLTYPE declType);
+bool IsDeclTypeNormalized(D3DDECLTYPE declType);
+
+void InitializeVertexTranslations(const rx::Renderer9 *renderer);
+
 }
 
 namespace gl_d3d9