Skip to content

A
angle
Commit d3dfda2b by Jamie Madill
Options

Refactor how we store vertex formats.

Instead of storing a vertex format as a struct with the full info, instead use an enum, and look up the info when we need it. This saves a lot of constructor initialization time, operator comparison time, and storage. It also will allow us to look up D3D format info more quickly. BUG=angleproject:959 Change-Id: I202fd1ea96981073bc1b5b232b1ec3efa91485cb Reviewed-on: https://chromium-review.googlesource.com/277289Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 2810a20c
Showing with 263 additions and 251 deletions
src/libANGLE/angletypes.cpp
...@@ -128,110 +128,6 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in ...@@ -128,110 +128,6 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in
} }
} }
VertexFormat::VertexFormat()
: mType(GL_NONE),
mNormalized(GL_FALSE),
mComponents(0),
mPureInteger(false)
{}
VertexFormat::VertexFormat(GLenum type, GLboolean normalized, GLuint components, bool pureInteger)
: mType(type),
mNormalized(normalized),
mComponents(components),
mPureInteger(pureInteger)
{
// Float data can not be normalized, so ignore the user setting
if (mType == GL_FLOAT || mType == GL_HALF_FLOAT || mType == GL_FIXED)
{
mNormalized = GL_FALSE;
}
}
VertexFormat::VertexFormat(const VertexAttribute &attrib)
: mType(attrib.type),
mNormalized(attrib.normalized ? GL_TRUE : GL_FALSE),
mComponents(attrib.size),
mPureInteger(attrib.pureInteger)
{
// Ensure we aren't initializing a vertex format which should be using
// the current-value type
ASSERT(attrib.enabled);
// Float data can not be normalized, so ignore the user setting
if (mType == GL_FLOAT || mType == GL_HALF_FLOAT || mType == GL_FIXED)
{
mNormalized = GL_FALSE;
}
}
VertexFormat::VertexFormat(const VertexAttribute &attrib, GLenum currentValueType)
: mType(attrib.type),
mNormalized(attrib.normalized ? GL_TRUE : GL_FALSE),
mComponents(attrib.size),
mPureInteger(attrib.pureInteger)
{
if (!attrib.enabled)
{
mType = currentValueType;
mNormalized = GL_FALSE;
mComponents = 4;
mPureInteger = (currentValueType != GL_FLOAT);
}
// Float data can not be normalized, so ignore the user setting
if (mType == GL_FLOAT || mType == GL_HALF_FLOAT || mType == GL_FIXED)
{
mNormalized = GL_FALSE;
}
}
void VertexFormat::GetInputLayout(VertexFormat *inputLayout,
Program *program,
const State &state)
{
const std::vector<VertexAttribute> &vertexAttributes = state.getVertexArray()->getVertexAttributes();
for (unsigned int attributeIndex = 0; attributeIndex < vertexAttributes.size(); attributeIndex++)
{
int semanticIndex = program->getSemanticIndex(attributeIndex);
if (semanticIndex != -1)
{
inputLayout[semanticIndex] = VertexFormat(vertexAttributes[attributeIndex], state.getVertexAttribCurrentValue(attributeIndex).Type);
}
}
}
bool VertexFormat::operator==(const VertexFormat &other) const
{
return (mType == other.mType &&
mComponents == other.mComponents &&
mNormalized == other.mNormalized &&
mPureInteger == other.mPureInteger );
}
bool VertexFormat::operator!=(const VertexFormat &other) const
{
return !(*this == other);
}
bool VertexFormat::operator<(const VertexFormat& other) const
{
if (mType != other.mType)
{
return mType < other.mType;
}
if (mNormalized != other.mNormalized)
{
return mNormalized < other.mNormalized;
}
if (mComponents != other.mComponents)
{
return mComponents < other.mComponents;
}
return mPureInteger < other.mPureInteger;
}
bool Box::operator==(const Box &other) const bool Box::operator==(const Box &other) const
{ {
return (x == other.x && y == other.y && z == other.z && return (x == other.x && y == other.y && z == other.z &&
......
src/libANGLE/angletypes.h
...@@ -256,27 +256,6 @@ struct PixelPackState ...@@ -256,27 +256,6 @@ struct PixelPackState
{} {}
}; };
struct VertexFormat
{
GLenum mType;
GLboolean mNormalized;
GLuint mComponents;
bool mPureInteger;
VertexFormat();
VertexFormat(GLenum type, GLboolean normalized, GLuint components, bool pureInteger);
explicit VertexFormat(const VertexAttribute &attribute);
VertexFormat(const VertexAttribute &attribute, GLenum currentValueType);
static void GetInputLayout(VertexFormat *inputLayout,
Program *program,
const State& currentValues);
bool operator==(const VertexFormat &other) const;
bool operator!=(const VertexFormat &other) const;
bool operator<(const VertexFormat& other) const;
};
} }
namespace rx namespace rx
......
src/libANGLE/formatutils.h
...@@ -76,6 +76,118 @@ GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type); ...@@ -76,6 +76,118 @@ GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type);
typedef std::set<GLenum> FormatSet; typedef std::set<GLenum> FormatSet;
const FormatSet &GetAllSizedInternalFormats(); const FormatSet &GetAllSizedInternalFormats();
enum VertexFormatType
{
VERTEX_FORMAT_INVALID,
VERTEX_FORMAT_SBYTE1,
VERTEX_FORMAT_SBYTE1_NORM,
VERTEX_FORMAT_SBYTE2,
VERTEX_FORMAT_SBYTE2_NORM,
VERTEX_FORMAT_SBYTE3,
VERTEX_FORMAT_SBYTE3_NORM,
VERTEX_FORMAT_SBYTE4,
VERTEX_FORMAT_SBYTE4_NORM,
VERTEX_FORMAT_UBYTE1,
VERTEX_FORMAT_UBYTE1_NORM,
VERTEX_FORMAT_UBYTE2,
VERTEX_FORMAT_UBYTE2_NORM,
VERTEX_FORMAT_UBYTE3,
VERTEX_FORMAT_UBYTE3_NORM,
VERTEX_FORMAT_UBYTE4,
VERTEX_FORMAT_UBYTE4_NORM,
VERTEX_FORMAT_SSHORT1,
VERTEX_FORMAT_SSHORT1_NORM,
VERTEX_FORMAT_SSHORT2,
VERTEX_FORMAT_SSHORT2_NORM,
VERTEX_FORMAT_SSHORT3,
VERTEX_FORMAT_SSHORT3_NORM,
VERTEX_FORMAT_SSHORT4,
VERTEX_FORMAT_SSHORT4_NORM,
VERTEX_FORMAT_USHORT1,
VERTEX_FORMAT_USHORT1_NORM,
VERTEX_FORMAT_USHORT2,
VERTEX_FORMAT_USHORT2_NORM,
VERTEX_FORMAT_USHORT3,
VERTEX_FORMAT_USHORT3_NORM,
VERTEX_FORMAT_USHORT4,
VERTEX_FORMAT_USHORT4_NORM,
VERTEX_FORMAT_SINT1,
VERTEX_FORMAT_SINT1_NORM,
VERTEX_FORMAT_SINT2,
VERTEX_FORMAT_SINT2_NORM,
VERTEX_FORMAT_SINT3,
VERTEX_FORMAT_SINT3_NORM,
VERTEX_FORMAT_SINT4,
VERTEX_FORMAT_SINT4_NORM,
VERTEX_FORMAT_UINT1,
VERTEX_FORMAT_UINT1_NORM,
VERTEX_FORMAT_UINT2,
VERTEX_FORMAT_UINT2_NORM,
VERTEX_FORMAT_UINT3,
VERTEX_FORMAT_UINT3_NORM,
VERTEX_FORMAT_UINT4,
VERTEX_FORMAT_UINT4_NORM,
VERTEX_FORMAT_SBYTE1_INT,
VERTEX_FORMAT_SBYTE2_INT,
VERTEX_FORMAT_SBYTE3_INT,
VERTEX_FORMAT_SBYTE4_INT,
VERTEX_FORMAT_UBYTE1_INT,
VERTEX_FORMAT_UBYTE2_INT,
VERTEX_FORMAT_UBYTE3_INT,
VERTEX_FORMAT_UBYTE4_INT,
VERTEX_FORMAT_SSHORT1_INT,
VERTEX_FORMAT_SSHORT2_INT,
VERTEX_FORMAT_SSHORT3_INT,
VERTEX_FORMAT_SSHORT4_INT,
VERTEX_FORMAT_USHORT1_INT,
VERTEX_FORMAT_USHORT2_INT,
VERTEX_FORMAT_USHORT3_INT,
VERTEX_FORMAT_USHORT4_INT,
VERTEX_FORMAT_SINT1_INT,
VERTEX_FORMAT_SINT2_INT,
VERTEX_FORMAT_SINT3_INT,
VERTEX_FORMAT_SINT4_INT,
VERTEX_FORMAT_UINT1_INT,
VERTEX_FORMAT_UINT2_INT,
VERTEX_FORMAT_UINT3_INT,
VERTEX_FORMAT_UINT4_INT,
VERTEX_FORMAT_FIXED1,
VERTEX_FORMAT_FIXED2,
VERTEX_FORMAT_FIXED3,
VERTEX_FORMAT_FIXED4,
VERTEX_FORMAT_HALF1,
VERTEX_FORMAT_HALF2,
VERTEX_FORMAT_HALF3,
VERTEX_FORMAT_HALF4,
VERTEX_FORMAT_FLOAT1,
VERTEX_FORMAT_FLOAT2,
VERTEX_FORMAT_FLOAT3,
VERTEX_FORMAT_FLOAT4,
VERTEX_FORMAT_SINT210,
VERTEX_FORMAT_UINT210,
VERTEX_FORMAT_SINT210_NORM,
VERTEX_FORMAT_UINT210_NORM,
VERTEX_FORMAT_SINT210_INT,
VERTEX_FORMAT_UINT210_INT,
};
typedef std::vector<gl::VertexFormatType> InputLayout;
struct VertexFormat : angle::NonCopyable
{
VertexFormat(GLenum typeIn, GLboolean normalizedIn, GLuint componentsIn, bool pureIntegerIn);
GLenum type;
GLboolean normalized;
GLuint components;
bool pureInteger;
};
VertexFormatType GetVertexFormatType(GLenum type, GLboolean normalized, GLuint components, bool pureInteger);
VertexFormatType GetVertexFormatType(const VertexAttribute &attrib);
VertexFormatType GetVertexFormatType(const VertexAttribute &attrib, GLenum currentValueType);
const VertexFormat &GetVertexFormatFromType(VertexFormatType vertexFormatType);
} }
#endif // LIBANGLE_FORMATUTILS_H_ #endif // LIBANGLE_FORMATUTILS_H_
src/libANGLE/renderer/d3d/DynamicHLSL.cpp
...@@ -380,7 +380,7 @@ std::string DynamicHLSL::generateVaryingHLSL(const ShaderD3D *shader) const ...@@ -380,7 +380,7 @@ std::string DynamicHLSL::generateVaryingHLSL(const ShaderD3D *shader) const
} }
std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &sourceShader, std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &sourceShader,
const VertexFormat inputLayout[], const InputLayout &inputLayout,
const std::vector<sh::Attribute> &shaderAttributes) const const std::vector<sh::Attribute> &shaderAttributes) const
{ {
std::string structHLSL, initHLSL; std::string structHLSL, initHLSL;
...@@ -414,7 +414,7 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s ...@@ -414,7 +414,7 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s
if (!shaderAttribute.name.empty()) if (!shaderAttribute.name.empty())
{ {
ASSERT(inputIndex < MAX_VERTEX_ATTRIBS); ASSERT(inputIndex < MAX_VERTEX_ATTRIBS);
const VertexFormat &vertexFormat = inputLayout[inputIndex]; VertexFormatType vertexFormatType = inputLayout[inputIndex];
// HLSL code for input structure // HLSL code for input structure
if (IsMatrixType(shaderAttribute.type)) if (IsMatrixType(shaderAttribute.type))
...@@ -424,7 +424,7 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s ...@@ -424,7 +424,7 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s
} }
else else
{ {
GLenum componentType = mRenderer->getVertexComponentType(vertexFormat); GLenum componentType = mRenderer->getVertexComponentType(vertexFormatType);
if (shaderAttribute.name == "gl_InstanceID") if (shaderAttribute.name == "gl_InstanceID")
{ {
...@@ -458,9 +458,9 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s ...@@ -458,9 +458,9 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s
// data reinterpretation (eg for pure integer->float, float->pure integer) // data reinterpretation (eg for pure integer->float, float->pure integer)
// TODO: issue warning with gl debug info extension, when supported // TODO: issue warning with gl debug info extension, when supported
if (IsMatrixType(shaderAttribute.type) || if (IsMatrixType(shaderAttribute.type) ||
(mRenderer->getVertexConversionType(vertexFormat) & VERTEX_CONVERT_GPU) != 0) (mRenderer->getVertexConversionType(vertexFormatType) & VERTEX_CONVERT_GPU) != 0)
{ {
initHLSL += generateAttributeConversionHLSL(vertexFormat, shaderAttribute); initHLSL += generateAttributeConversionHLSL(vertexFormatType, shaderAttribute);
} }
else else
{ {
...@@ -1214,8 +1214,10 @@ std::string DynamicHLSL::decorateVariable(const std::string &name) ...@@ -1214,8 +1214,10 @@ std::string DynamicHLSL::decorateVariable(const std::string &name)
return name; return name;
} }
std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &vertexFormat, const sh::ShaderVariable &shaderAttrib) const std::string DynamicHLSL::generateAttributeConversionHLSL(gl::VertexFormatType vertexFormatType,
const sh::ShaderVariable &shaderAttrib) const
{ {
const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromType(vertexFormatType);
std::string attribString = "input." + decorateVariable(shaderAttrib.name); std::string attribString = "input." + decorateVariable(shaderAttrib.name);
// Matrix // Matrix
...@@ -1228,12 +1230,12 @@ std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &ver ...@@ -1228,12 +1230,12 @@ std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &ver
int shaderComponentCount = VariableComponentCount(shaderAttrib.type); int shaderComponentCount = VariableComponentCount(shaderAttrib.type);
// Perform integer to float conversion (if necessary) // Perform integer to float conversion (if necessary)
bool requiresTypeConversion = (shaderComponentType == GL_FLOAT && vertexFormat.mType != GL_FLOAT); bool requiresTypeConversion = (shaderComponentType == GL_FLOAT && vertexFormat.type != GL_FLOAT);
if (requiresTypeConversion) if (requiresTypeConversion)
{ {
// TODO: normalization for 32-bit integer formats // TODO: normalization for 32-bit integer formats
ASSERT(!vertexFormat.mNormalized && !vertexFormat.mPureInteger); ASSERT(!vertexFormat.normalized && !vertexFormat.pureInteger);
return "float" + Str(shaderComponentCount) + "(" + attribString + ")"; return "float" + Str(shaderComponentCount) + "(" + attribString + ")";
} }
...@@ -1241,22 +1243,4 @@ std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &ver ...@@ -1241,22 +1243,4 @@ std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &ver
return attribString; return attribString;
} }
void DynamicHLSL::getInputLayoutSignature(const VertexFormat inputLayout[], GLenum signature[]) const
{
for (size_t inputIndex = 0; inputIndex < MAX_VERTEX_ATTRIBS; inputIndex++)
{
const VertexFormat &vertexFormat = inputLayout[inputIndex];
if (vertexFormat.mType == GL_NONE)
{
signature[inputIndex] = GL_NONE;
}
else
{
bool gpuConverted = ((mRenderer->getVertexConversionType(vertexFormat) & VERTEX_CONVERT_GPU) != 0);
signature[inputIndex] = (gpuConverted ? GL_TRUE : GL_FALSE);
}
}
}
} }
src/libANGLE/renderer/d3d/DynamicHLSL.h
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
#ifndef LIBANGLE_RENDERER_D3D_DYNAMICHLSL_H_ #ifndef LIBANGLE_RENDERER_D3D_DYNAMICHLSL_H_
#define LIBANGLE_RENDERER_D3D_DYNAMICHLSL_H_ #define LIBANGLE_RENDERER_D3D_DYNAMICHLSL_H_
#include "common/angleutils.h" #include <map>
#include "libANGLE/Constants.h" #include <vector>
#include "angle_gl.h" #include "angle_gl.h"
#include "common/angleutils.h"
#include <vector> #include "libANGLE/Constants.h"
#include <map> #include "libANGLE/formatutils.h"
namespace sh namespace sh
{ {
...@@ -29,7 +29,6 @@ class InfoLog; ...@@ -29,7 +29,6 @@ class InfoLog;
struct VariableLocation; struct VariableLocation;
struct LinkedVarying; struct LinkedVarying;
struct VertexAttribute; struct VertexAttribute;
struct VertexFormat;
struct PackedVarying; struct PackedVarying;
struct Data; struct Data;
} }
...@@ -57,7 +56,7 @@ class DynamicHLSL : angle::NonCopyable ...@@ -57,7 +56,7 @@ class DynamicHLSL : angle::NonCopyable
int packVaryings(gl::InfoLog &infoLog, VaryingPacking packing, ShaderD3D *fragmentShader, int packVaryings(gl::InfoLog &infoLog, VaryingPacking packing, ShaderD3D *fragmentShader,
ShaderD3D *vertexShader, const std::vector<std::string>& transformFeedbackVaryings); ShaderD3D *vertexShader, const std::vector<std::string>& transformFeedbackVaryings);
std::string generateVertexShaderForInputLayout(const std::string &sourceShader, std::string generateVertexShaderForInputLayout(const std::string &sourceShader,
const gl::VertexFormat inputLayout[], const gl::InputLayout &inputLayout,
const std::vector<sh::Attribute> &shaderAttributes) const; const std::vector<sh::Attribute> &shaderAttributes) const;
std::string generatePixelShaderForOutputSignature(const std::string &sourceShader, const std::vector<PixelShaderOutputVariable> &outputVariables, std::string generatePixelShaderForOutputSignature(const std::string &sourceShader, const std::vector<PixelShaderOutputVariable> &outputVariables,
bool usesFragDepth, const std::vector<GLenum> &outputLayout) const; bool usesFragDepth, const std::vector<GLenum> &outputLayout) const;
...@@ -72,7 +71,6 @@ class DynamicHLSL : angle::NonCopyable ...@@ -72,7 +71,6 @@ class DynamicHLSL : angle::NonCopyable
bool *outUsesFragDepth) const; bool *outUsesFragDepth) const;
std::string generateGeometryShaderHLSL(int registers, ShaderD3D *fragmentShader, ShaderD3D *vertexShader) const; std::string generateGeometryShaderHLSL(int registers, ShaderD3D *fragmentShader, ShaderD3D *vertexShader) const;
void getInputLayoutSignature(const gl::VertexFormat inputLayout[], GLenum signature[]) const;
private: private:
RendererD3D *const mRenderer; RendererD3D *const mRenderer;
...@@ -92,7 +90,8 @@ class DynamicHLSL : angle::NonCopyable ...@@ -92,7 +90,8 @@ class DynamicHLSL : angle::NonCopyable
// Prepend an underscore // Prepend an underscore
static std::string decorateVariable(const std::string &name); static std::string decorateVariable(const std::string &name);
std::string generateAttributeConversionHLSL(const gl::VertexFormat &vertexFormat, const sh::ShaderVariable &shaderAttrib) const; std::string generateAttributeConversionHLSL(gl::VertexFormatType vertexFormatType,
const sh::ShaderVariable &shaderAttrib) const;
}; };
} }
......
src/libANGLE/renderer/d3d/ProgramD3D.h
...@@ -9,16 +9,17 @@ ...@@ -9,16 +9,17 @@
#ifndef LIBANGLE_RENDERER_D3D_PROGRAMD3D_H_ #ifndef LIBANGLE_RENDERER_D3D_PROGRAMD3D_H_
#define LIBANGLE_RENDERER_D3D_PROGRAMD3D_H_ #define LIBANGLE_RENDERER_D3D_PROGRAMD3D_H_
#include <string>
#include <vector>
#include "common/Optional.h" #include "common/Optional.h"
#include "compiler/translator/blocklayoutHLSL.h" #include "compiler/translator/blocklayoutHLSL.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/formatutils.h"
#include "libANGLE/renderer/ProgramImpl.h" #include "libANGLE/renderer/ProgramImpl.h"
#include "libANGLE/renderer/Workarounds.h" #include "libANGLE/renderer/Workarounds.h"
#include "libANGLE/renderer/d3d/DynamicHLSL.h" #include "libANGLE/renderer/d3d/DynamicHLSL.h"
#include <string>
#include <vector>
namespace gl namespace gl
{ {
struct LinkedUniform; struct LinkedUniform;
...@@ -65,7 +66,7 @@ class ProgramD3D : public ProgramImpl ...@@ -65,7 +66,7 @@ class ProgramD3D : public ProgramImpl
gl::Error getPixelExecutableForFramebuffer(const gl::Framebuffer *fbo, ShaderExecutableD3D **outExectuable); gl::Error getPixelExecutableForFramebuffer(const gl::Framebuffer *fbo, ShaderExecutableD3D **outExectuable);
gl::Error getPixelExecutableForOutputLayout(const std::vector<GLenum> &outputLayout, ShaderExecutableD3D **outExectuable, gl::InfoLog *infoLog); gl::Error getPixelExecutableForOutputLayout(const std::vector<GLenum> &outputLayout, ShaderExecutableD3D **outExectuable, gl::InfoLog *infoLog);
gl::Error getVertexExecutableForInputLayout(const gl::VertexFormat inputLayout[gl::MAX_VERTEX_ATTRIBS], ShaderExecutableD3D **outExectuable, gl::InfoLog *infoLog); gl::Error getVertexExecutableForInputLayout(const gl::InputLayout &inputLayout, ShaderExecutableD3D **outExectuable, gl::InfoLog *infoLog);
ShaderExecutableD3D *getGeometryExecutable() const { return mGeometryExecutable; } ShaderExecutableD3D *getGeometryExecutable() const { return mGeometryExecutable; }
LinkResult compileProgramExecutables(gl::InfoLog &infoLog, gl::Shader *fragmentShader, gl::Shader *vertexShader, LinkResult compileProgramExecutables(gl::InfoLog &infoLog, gl::Shader *fragmentShader, gl::Shader *vertexShader,
...@@ -80,8 +81,6 @@ class ProgramD3D : public ProgramImpl ...@@ -80,8 +81,6 @@ class ProgramD3D : public ProgramImpl
void bindAttributeLocation(GLuint index, const std::string &name) override; void bindAttributeLocation(GLuint index, const std::string &name) override;
void getInputLayoutSignature(const gl::VertexFormat inputLayout[], GLenum signature[]) const;
void initializeUniformStorage(); void initializeUniformStorage();
gl::Error applyUniforms(); gl::Error applyUniforms();
gl::Error applyUniformBuffers(const gl::Data &data, GLuint uniformBlockBindings[]) override; gl::Error applyUniformBuffers(const gl::Data &data, GLuint uniformBlockBindings[]) override;
...@@ -131,24 +130,32 @@ class ProgramD3D : public ProgramImpl ...@@ -131,24 +130,32 @@ class ProgramD3D : public ProgramImpl
int sortedSemanticIndicesOut[gl::MAX_VERTEX_ATTRIBS], int sortedSemanticIndicesOut[gl::MAX_VERTEX_ATTRIBS],
const rx::TranslatedAttribute *sortedAttributesOut[gl::MAX_VERTEX_ATTRIBS]) const; const rx::TranslatedAttribute *sortedAttributesOut[gl::MAX_VERTEX_ATTRIBS]) const;
void updateCachedInputLayout(const gl::Program *program, const gl::State &state);
const gl::InputLayout &getCachedInputLayout() const { return mCachedInputLayout; }
private: private:
class VertexExecutable class VertexExecutable
{ {
public: public:
VertexExecutable(const gl::VertexFormat inputLayout[gl::MAX_VERTEX_ATTRIBS], typedef std::vector<GLenum> Signature;
const GLenum signature[gl::MAX_VERTEX_ATTRIBS],
VertexExecutable(const gl::InputLayout &inputLayout,
const Signature &signature,
ShaderExecutableD3D *shaderExecutable); ShaderExecutableD3D *shaderExecutable);
~VertexExecutable(); ~VertexExecutable();
bool matchesSignature(const GLenum convertedLayout[gl::MAX_VERTEX_ATTRIBS]) const; bool matchesSignature(const Signature &signature) const;
static void getSignature(RendererD3D *renderer,
const gl::InputLayout &inputLayout,
Signature *signatureOut);
const gl::VertexFormat *inputs() const { return mInputs; } const gl::InputLayout &inputs() const { return mInputs; }
const GLenum *signature() const { return mSignature; } const Signature &signature() const { return mSignature; }
ShaderExecutableD3D *shaderExecutable() const { return mShaderExecutable; } ShaderExecutableD3D *shaderExecutable() const { return mShaderExecutable; }
private: private:
gl::VertexFormat mInputs[gl::MAX_VERTEX_ATTRIBS]; gl::InputLayout mInputs;
GLenum mSignature[gl::MAX_VERTEX_ATTRIBS]; Signature mSignature;
ShaderExecutableD3D *mShaderExecutable; ShaderExecutableD3D *mShaderExecutable;
}; };
...@@ -243,6 +250,8 @@ class ProgramD3D : public ProgramImpl ...@@ -243,6 +250,8 @@ class ProgramD3D : public ProgramImpl
std::vector<GLint> mVertexUBOCache; std::vector<GLint> mVertexUBOCache;
std::vector<GLint> mFragmentUBOCache; std::vector<GLint> mFragmentUBOCache;
VertexExecutable::Signature mCachedVertexSignature;
gl::InputLayout mCachedInputLayout;
static unsigned int issueSerial(); static unsigned int issueSerial();
static unsigned int mCurrentSerial; static unsigned int mCurrentSerial;
......
src/libANGLE/renderer/d3d/RendererD3D.cpp
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "libANGLE/renderer/d3d/BufferD3D.h" #include "libANGLE/renderer/d3d/BufferD3D.h"
#include "libANGLE/renderer/d3d/DisplayD3D.h" #include "libANGLE/renderer/d3d/DisplayD3D.h"
#include "libANGLE/renderer/d3d/IndexDataManager.h" #include "libANGLE/renderer/d3d/IndexDataManager.h"
#include "libANGLE/renderer/d3d/ProgramD3D.h"
namespace rx namespace rx
{ {
...@@ -31,6 +32,7 @@ namespace ...@@ -31,6 +32,7 @@ namespace
// release and recreate the scratch buffer. This ensures we don't have a // release and recreate the scratch buffer. This ensures we don't have a
// degenerate case where we are stuck hogging memory. // degenerate case where we are stuck hogging memory.
const int ScratchMemoryBufferLifetime = 1000; const int ScratchMemoryBufferLifetime = 1000;
} }
const uintptr_t RendererD3D::DirtyPointer = std::numeric_limits<uintptr_t>::max(); const uintptr_t RendererD3D::DirtyPointer = std::numeric_limits<uintptr_t>::max();
...@@ -366,13 +368,11 @@ gl::Error RendererD3D::applyState(const gl::Data &data, GLenum drawMode) ...@@ -366,13 +368,11 @@ gl::Error RendererD3D::applyState(const gl::Data &data, GLenum drawMode)
gl::Error RendererD3D::applyShaders(const gl::Data &data) gl::Error RendererD3D::applyShaders(const gl::Data &data)
{ {
gl::Program *program = data.state->getProgram(); gl::Program *program = data.state->getProgram();
GetImplAs<ProgramD3D>(program)->updateCachedInputLayout(program, *data.state);
gl::VertexFormat inputLayout[gl::MAX_VERTEX_ATTRIBS];
gl::VertexFormat::GetInputLayout(inputLayout, program, *data.state);
const gl::Framebuffer *fbo = data.state->getDrawFramebuffer(); const gl::Framebuffer *fbo = data.state->getDrawFramebuffer();
gl::Error error = applyShaders(program, inputLayout, fbo, data.state->getRasterizerState().rasterizerDiscard, data.state->isTransformFeedbackActiveUnpaused()); gl::Error error = applyShaders(program, fbo, data.state->getRasterizerState().rasterizerDiscard, data.state->isTransformFeedbackActiveUnpaused());
if (error.isError()) if (error.isError())
{ {
return error; return error;
......
src/libANGLE/renderer/d3d/RendererD3D.h
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "common/debug.h" #include "common/debug.h"
#include "common/MemoryBuffer.h" #include "common/MemoryBuffer.h"
#include "libANGLE/Data.h" #include "libANGLE/Data.h"
#include "libANGLe/formatutils.h"
#include "libANGLE/renderer/Renderer.h" #include "libANGLE/renderer/Renderer.h"
#include "libANGLE/renderer/d3d/VertexDataManager.h" #include "libANGLE/renderer/d3d/VertexDataManager.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h" #include "libANGLE/renderer/d3d/formatutilsD3D.h"
...@@ -77,8 +78,8 @@ class BufferFactoryD3D ...@@ -77,8 +78,8 @@ class BufferFactoryD3D
virtual IndexBuffer *createIndexBuffer() = 0; virtual IndexBuffer *createIndexBuffer() = 0;
// TODO(jmadill): add VertexFormatCaps // TODO(jmadill): add VertexFormatCaps
virtual VertexConversionType getVertexConversionType(const gl::VertexFormat &vertexFormat) const = 0; virtual VertexConversionType getVertexConversionType(gl::VertexFormatType vertexFormatType) const = 0;
virtual GLenum getVertexComponentType(const gl::VertexFormat &vertexFormat) const = 0; virtual GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const = 0;
}; };
class RendererD3D : public Renderer, public BufferFactoryD3D class RendererD3D : public Renderer, public BufferFactoryD3D
...@@ -130,8 +131,10 @@ class RendererD3D : public Renderer, public BufferFactoryD3D ...@@ -130,8 +131,10 @@ class RendererD3D : public Renderer, public BufferFactoryD3D
bool ignoreViewport) = 0; bool ignoreViewport) = 0;
virtual gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) = 0; virtual gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) = 0;
virtual gl::Error applyShaders(gl::Program *program, const gl::VertexFormat inputLayout[], const gl::Framebuffer *framebuffer, virtual gl::Error applyShaders(gl::Program *program,
bool rasterizerDiscard, bool transformFeedbackActive) = 0; const gl::Framebuffer *framebuffer,
bool rasterizerDiscard,
bool transformFeedbackActive) = 0;
virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray) = 0; virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray) = 0;
virtual bool applyPrimitiveType(GLenum primitiveType, GLsizei elementCount, bool usesPointSize) = 0; virtual bool applyPrimitiveType(GLenum primitiveType, GLsizei elementCount, bool usesPointSize) = 0;
virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceIndexInfo) = 0; virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceIndexInfo) = 0;
......
src/libANGLE/renderer/d3d/VertexBuffer.cpp
...@@ -188,14 +188,14 @@ bool VertexBufferInterface::directStoragePossible(const gl::VertexAttribute &att ...@@ -188,14 +188,14 @@ bool VertexBufferInterface::directStoragePossible(const gl::VertexAttribute &att
if (attrib.type != GL_FLOAT) if (attrib.type != GL_FLOAT)
{ {
gl::VertexFormat vertexFormat(attrib, currentValueType); gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
unsigned int outputElementSize; unsigned int outputElementSize;
getVertexBuffer()->getSpaceRequired(attrib, 1, 0, &outputElementSize); getVertexBuffer()->getSpaceRequired(attrib, 1, 0, &outputElementSize);
alignment = std::min<size_t>(outputElementSize, 4); alignment = std::min<size_t>(outputElementSize, 4);
// TODO(jmadill): add VertexFormatCaps // TODO(jmadill): add VertexFormatCaps
requiresConversion = (mFactory->getVertexConversionType(vertexFormat) & VERTEX_CONVERT_CPU) != 0; requiresConversion = (mFactory->getVertexConversionType(vertexFormatType) & VERTEX_CONVERT_CPU) != 0;
} }
bool isAligned = (static_cast<size_t>(ComputeVertexAttributeStride(attrib)) % alignment == 0) && bool isAligned = (static_cast<size_t>(ComputeVertexAttributeStride(attrib)) % alignment == 0) &&
......
src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
...@@ -28,16 +28,22 @@ namespace ...@@ -28,16 +28,22 @@ namespace
void GetInputLayout(const TranslatedAttribute *translatedAttributes[gl::MAX_VERTEX_ATTRIBS], void GetInputLayout(const TranslatedAttribute *translatedAttributes[gl::MAX_VERTEX_ATTRIBS],
size_t attributeCount, size_t attributeCount,
gl::VertexFormat inputLayout[gl::MAX_VERTEX_ATTRIBS]) gl::InputLayout *inputLayout)
{ {
for (size_t attributeIndex = 0; attributeIndex < attributeCount; ++attributeIndex) for (size_t attributeIndex = 0; attributeIndex < attributeCount; ++attributeIndex)
{ {
const TranslatedAttribute *translatedAttribute = translatedAttributes[attributeIndex]; const TranslatedAttribute *translatedAttribute = translatedAttributes[attributeIndex];
if (translatedAttributes[attributeIndex]->active) if (translatedAttribute->active)
{ {
inputLayout[attributeIndex] = gl::VertexFormat(*translatedAttribute->attribute, gl::VertexFormatType vertexFormatType =
translatedAttribute->currentValueType); gl::GetVertexFormatType(*translatedAttribute->attribute,
translatedAttribute->currentValueType);
inputLayout->push_back(vertexFormatType);
}
else
{
inputLayout->push_back(gl::VERTEX_FORMAT_INVALID);
} }
} }
} }
...@@ -167,8 +173,8 @@ gl::Error InputLayoutCache::applyVertexBuffers(const std::vector<TranslatedAttri ...@@ -167,8 +173,8 @@ gl::Error InputLayoutCache::applyVertexBuffers(const std::vector<TranslatedAttri
// If rendering points and instanced pointsprite emulation is being used, the inputClass is required to be configured as per instance data // If rendering points and instanced pointsprite emulation is being used, the inputClass is required to be configured as per instance data
inputClass = instancedPointSpritesActive ? D3D11_INPUT_PER_INSTANCE_DATA : inputClass; inputClass = instancedPointSpritesActive ? D3D11_INPUT_PER_INSTANCE_DATA : inputClass;
gl::VertexFormat vertexFormat(*sortedAttributes[i]->attribute, sortedAttributes[i]->currentValueType); gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(*sortedAttributes[i]->attribute, sortedAttributes[i]->currentValueType);
const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormat, mFeatureLevel); const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormatType, mFeatureLevel);
// Record the type of the associated vertex shader vector in our key // Record the type of the associated vertex shader vector in our key
// This will prevent mismatched vertex shaders from using the same input layout // This will prevent mismatched vertex shaders from using the same input layout
...@@ -280,8 +286,8 @@ gl::Error InputLayoutCache::applyVertexBuffers(const std::vector<TranslatedAttri ...@@ -280,8 +286,8 @@ gl::Error InputLayoutCache::applyVertexBuffers(const std::vector<TranslatedAttri
} }
else else
{ {
gl::VertexFormat shaderInputLayout[gl::MAX_VERTEX_ATTRIBS]; gl::InputLayout shaderInputLayout;
GetInputLayout(sortedAttributes, unsortedAttributes.size(), shaderInputLayout); GetInputLayout(sortedAttributes, unsortedAttributes.size(), &shaderInputLayout);
ShaderExecutableD3D *shader = nullptr; ShaderExecutableD3D *shader = nullptr;
gl::Error error = programD3D->getVertexExecutableForInputLayout(shaderInputLayout, &shader, nullptr); gl::Error error = programD3D->getVertexExecutableForInputLayout(shaderInputLayout, &shader, nullptr);
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
...@@ -2000,10 +2000,13 @@ gl::Error Renderer11::drawTriangleFan(GLsizei count, GLenum type, const GLvoid * ...@@ -2000,10 +2000,13 @@ gl::Error Renderer11::drawTriangleFan(GLsizei count, GLenum type, const GLvoid *
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
gl::Error Renderer11::applyShaders(gl::Program *program, const gl::VertexFormat inputLayout[], const gl::Framebuffer *framebuffer, gl::Error Renderer11::applyShaders(gl::Program *program,
bool rasterizerDiscard, bool transformFeedbackActive) const gl::Framebuffer *framebuffer,
bool rasterizerDiscard,
bool transformFeedbackActive)
{ {
ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program); ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
const auto &inputLayout = programD3D->getCachedInputLayout();
ShaderExecutableD3D *vertexExe = NULL; ShaderExecutableD3D *vertexExe = NULL;
gl::Error error = programD3D->getVertexExecutableForInputLayout(inputLayout, &vertexExe, nullptr); gl::Error error = programD3D->getVertexExecutableForInputLayout(inputLayout, &vertexExe, nullptr);
...@@ -3732,14 +3735,14 @@ bool Renderer11::getLUID(LUID *adapterLuid) const ...@@ -3732,14 +3735,14 @@ bool Renderer11::getLUID(LUID *adapterLuid) const
return true; return true;
} }
VertexConversionType Renderer11::getVertexConversionType(const gl::VertexFormat &vertexFormat) const VertexConversionType Renderer11::getVertexConversionType(gl::VertexFormatType vertexFormatType) const
{ {
return d3d11::GetVertexFormatInfo(vertexFormat, mRenderer11DeviceCaps.featureLevel).conversionType; return d3d11::GetVertexFormatInfo(vertexFormatType, mRenderer11DeviceCaps.featureLevel).conversionType;
} }
GLenum Renderer11::getVertexComponentType(const gl::VertexFormat &vertexFormat) const GLenum Renderer11::getVertexComponentType(gl::VertexFormatType vertexFormatType) const
{ {
return d3d11::GetDXGIFormatInfo(d3d11::GetVertexFormatInfo(vertexFormat, mRenderer11DeviceCaps.featureLevel).nativeFormat).componentType; return d3d11::GetDXGIFormatInfo(d3d11::GetVertexFormatInfo(vertexFormatType, mRenderer11DeviceCaps.featureLevel).nativeFormat).componentType;
} }
void Renderer11::generateCaps(gl::Caps *outCaps, gl::TextureCapsMap *outTextureCaps, gl::Extensions *outExtensions) const void Renderer11::generateCaps(gl::Caps *outCaps, gl::TextureCapsMap *outTextureCaps, gl::Extensions *outExtensions) const
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.h
...@@ -130,8 +130,10 @@ class Renderer11 : public RendererD3D ...@@ -130,8 +130,10 @@ class Renderer11 : public RendererD3D
virtual bool applyPrimitiveType(GLenum mode, GLsizei count, bool usesPointSize); virtual bool applyPrimitiveType(GLenum mode, GLsizei count, bool usesPointSize);
gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) override; gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) override;
virtual gl::Error applyShaders(gl::Program *program, const gl::VertexFormat inputLayout[], const gl::Framebuffer *framebuffer, gl::Error applyShaders(gl::Program *program,
bool rasterizerDiscard, bool transformFeedbackActive); const gl::Framebuffer *framebuffer,
bool rasterizerDiscard,
bool transformFeedbackActive) override;
virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray); virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray);
virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceIndexInfo); virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceIndexInfo);
...@@ -248,8 +250,8 @@ class Renderer11 : public RendererD3D ...@@ -248,8 +250,8 @@ class Renderer11 : public RendererD3D
gl::Error packPixels(ID3D11Texture2D *readTexture, const PackPixelsParams &params, uint8_t *pixelsOut); gl::Error packPixels(ID3D11Texture2D *readTexture, const PackPixelsParams &params, uint8_t *pixelsOut);
bool getLUID(LUID *adapterLuid) const override; bool getLUID(LUID *adapterLuid) const override;
virtual VertexConversionType getVertexConversionType(const gl::VertexFormat &vertexFormat) const; VertexConversionType getVertexConversionType(gl::VertexFormatType vertexFormatType) const override;
virtual GLenum getVertexComponentType(const gl::VertexFormat &vertexFormat) const; GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const override;
gl::Error readTextureData(ID3D11Texture2D *texture, unsigned int subResource, const gl::Rectangle &area, GLenum format, gl::Error readTextureData(ID3D11Texture2D *texture, unsigned int subResource, const gl::Rectangle &area, GLenum format,
GLenum type, GLuint outputPitch, const gl::PixelPackState &pack, uint8_t *pixels); GLenum type, GLuint outputPitch, const gl::PixelPackState &pack, uint8_t *pixels);
......
src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "libANGLE/Buffer.h" #include "libANGLE/Buffer.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
#include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/d3d11/Buffer11.h" #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h" #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
...@@ -134,9 +135,9 @@ gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attri ...@@ -134,9 +135,9 @@ gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attri
input += inputStride * start; input += inputStride * start;
} }
gl::VertexFormat vertexFormat(attrib, currentValueType); gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
const D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel; const D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel;
const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormat, featureLevel); const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormatType, featureLevel);
ASSERT(vertexFormatInfo.copyFunction != NULL); ASSERT(vertexFormatInfo.copyFunction != NULL);
vertexFormatInfo.copyFunction(input, inputStride, count, output); vertexFormatInfo.copyFunction(input, inputStride, count, output);
...@@ -159,9 +160,9 @@ gl::Error VertexBuffer11::getSpaceRequired(const gl::VertexAttribute &attrib, GL ...@@ -159,9 +160,9 @@ gl::Error VertexBuffer11::getSpaceRequired(const gl::VertexAttribute &attrib, GL
elementCount = UnsignedCeilDivide(static_cast<unsigned int>(instances), attrib.divisor); elementCount = UnsignedCeilDivide(static_cast<unsigned int>(instances), attrib.divisor);
} }
gl::VertexFormat vertexFormat(attrib); gl::VertexFormatType formatType = gl::GetVertexFormatType(attrib);
const D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel; const D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel;
const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormat, featureLevel); const d3d11::VertexFormat &vertexFormatInfo = d3d11::GetVertexFormatInfo(formatType, featureLevel);
const d3d11::DXGIFormat &dxgiFormatInfo = d3d11::GetDXGIFormatInfo(vertexFormatInfo.nativeFormat); const d3d11::DXGIFormat &dxgiFormatInfo = d3d11::GetDXGIFormatInfo(vertexFormatInfo.nativeFormat);
unsigned int elementSize = dxgiFormatInfo.pixelBytes; unsigned int elementSize = dxgiFormatInfo.pixelBytes;
if (elementSize <= std::numeric_limits<unsigned int>::max() / elementCount) if (elementSize <= std::numeric_limits<unsigned int>::max() / elementCount)
......
src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
...@@ -1099,8 +1099,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, const Renderer1 ...@@ -1099,8 +1099,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, const Renderer1
return defaultInfo; return defaultInfo;
} }
typedef std::map<gl::VertexFormat, VertexFormat> D3D11VertexFormatInfoMap; typedef std::map<gl::VertexFormatType, VertexFormat> D3D11VertexFormatInfoMap;
typedef std::pair<gl::VertexFormat, VertexFormat> D3D11VertexFormatPair; typedef std::pair<gl::VertexFormatType, VertexFormat> D3D11VertexFormatPair;
VertexFormat::VertexFormat() VertexFormat::VertexFormat()
: conversionType(VERTEX_CONVERT_NONE), : conversionType(VERTEX_CONVERT_NONE),
...@@ -1109,30 +1109,39 @@ VertexFormat::VertexFormat() ...@@ -1109,30 +1109,39 @@ VertexFormat::VertexFormat()
{ {
} }
static void AddVertexFormatInfo(D3D11VertexFormatInfoMap *map, GLenum inputType, GLboolean normalized, GLuint componentCount, static void AddVertexFormatInfo(D3D11VertexFormatInfoMap *map,
VertexConversionType conversionType, DXGI_FORMAT nativeFormat, VertexCopyFunction copyFunction) GLenum inputType,
GLboolean normalized,
GLuint componentCount,
VertexConversionType conversionType,
DXGI_FORMAT nativeFormat,
VertexCopyFunction copyFunction)
{ {
gl::VertexFormat inputFormat(inputType, normalized, componentCount, false); gl::VertexFormatType formatType = gl::GetVertexFormatType(inputType, normalized, componentCount, false);
VertexFormat info; VertexFormat info;
info.conversionType = conversionType; info.conversionType = conversionType;
info.nativeFormat = nativeFormat; info.nativeFormat = nativeFormat;
info.copyFunction = copyFunction; info.copyFunction = copyFunction;
map->insert(D3D11VertexFormatPair(inputFormat, info)); map->insert(D3D11VertexFormatPair(formatType, info));
} }
static void AddIntegerVertexFormatInfo(D3D11VertexFormatInfoMap *map, GLenum inputType, GLuint componentCount, static void AddIntegerVertexFormatInfo(D3D11VertexFormatInfoMap *map,
VertexConversionType conversionType, DXGI_FORMAT nativeFormat, VertexCopyFunction copyFunction) GLenum inputType,
GLuint componentCount,
VertexConversionType conversionType,
DXGI_FORMAT nativeFormat,
VertexCopyFunction copyFunction)
{ {
gl::VertexFormat inputFormat(inputType, GL_FALSE, componentCount, true); gl::VertexFormatType formatType = gl::GetVertexFormatType(inputType, GL_FALSE, componentCount, true);
VertexFormat info; VertexFormat info;
info.conversionType = conversionType; info.conversionType = conversionType;
info.nativeFormat = nativeFormat; info.nativeFormat = nativeFormat;
info.copyFunction = copyFunction; info.copyFunction = copyFunction;
map->insert(D3D11VertexFormatPair(inputFormat, info)); map->insert(D3D11VertexFormatPair(formatType, info));
} }
static D3D11VertexFormatInfoMap BuildD3D11_FL9_3VertexFormatInfoOverrideMap() static D3D11VertexFormatInfoMap BuildD3D11_FL9_3VertexFormatInfoOverrideMap()
...@@ -1354,7 +1363,7 @@ static D3D11VertexFormatInfoMap BuildD3D11VertexFormatInfoMap() ...@@ -1354,7 +1363,7 @@ static D3D11VertexFormatInfoMap BuildD3D11VertexFormatInfoMap()
return map; return map;
} }
const VertexFormat &GetVertexFormatInfo(const gl::VertexFormat &vertexFormat, D3D_FEATURE_LEVEL featureLevel) const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D3D_FEATURE_LEVEL featureLevel)
{ {
static const D3D11VertexFormatInfoMap vertexFormatMap = BuildD3D11VertexFormatInfoMap(); static const D3D11VertexFormatInfoMap vertexFormatMap = BuildD3D11VertexFormatInfoMap();
static const D3D11VertexFormatInfoMap vertexFormatMapFL9_3Override = BuildD3D11_FL9_3VertexFormatInfoOverrideMap(); static const D3D11VertexFormatInfoMap vertexFormatMapFL9_3Override = BuildD3D11_FL9_3VertexFormatInfoOverrideMap();
...@@ -1362,14 +1371,14 @@ const VertexFormat &GetVertexFormatInfo(const gl::VertexFormat &vertexFormat, D3 ...@@ -1362,14 +1371,14 @@ const VertexFormat &GetVertexFormatInfo(const gl::VertexFormat &vertexFormat, D3
if (featureLevel == D3D_FEATURE_LEVEL_9_3) if (featureLevel == D3D_FEATURE_LEVEL_9_3)
{ {
// First see if the format has a special mapping for FL9_3 // First see if the format has a special mapping for FL9_3
D3D11VertexFormatInfoMap::const_iterator iter = vertexFormatMapFL9_3Override.find(vertexFormat); D3D11VertexFormatInfoMap::const_iterator iter = vertexFormatMapFL9_3Override.find(vertexFormatType);
if (iter != vertexFormatMapFL9_3Override.end()) if (iter != vertexFormatMapFL9_3Override.end())
{ {
return iter->second; return iter->second;
} }
} }
D3D11VertexFormatInfoMap::const_iterator iter = vertexFormatMap.find(vertexFormat); D3D11VertexFormatInfoMap::const_iterator iter = vertexFormatMap.find(vertexFormatType);
if (iter != vertexFormatMap.end()) if (iter != vertexFormatMap.end())
{ {
return iter->second; return iter->second;
......
src/libANGLE/renderer/d3d/d3d11/formatutils11.h
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_
#define LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_ #define LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_
#include "libANGLE/renderer/d3d/formatutilsD3D.h" #include <map>
#include "libANGLE/angletypes.h"
#include "common/platform.h" #include "common/platform.h"
#include "libANGLE/angletypes.h"
#include <map> #include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h"
namespace rx namespace rx
{ {
...@@ -89,7 +89,7 @@ struct VertexFormat ...@@ -89,7 +89,7 @@ struct VertexFormat
DXGI_FORMAT nativeFormat; DXGI_FORMAT nativeFormat;
VertexCopyFunction copyFunction; VertexCopyFunction copyFunction;
}; };
const VertexFormat &GetVertexFormatInfo(const gl::VertexFormat &vertexFormat, D3D_FEATURE_LEVEL featureLevel); const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D3D_FEATURE_LEVEL featureLevel);
} }
......
src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
...@@ -1824,13 +1824,16 @@ gl::Error Renderer9::getCountingIB(size_t count, StaticIndexBufferInterface **ou ...@@ -1824,13 +1824,16 @@ gl::Error Renderer9::getCountingIB(size_t count, StaticIndexBufferInterface **ou
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
gl::Error Renderer9::applyShaders(gl::Program *program, const gl::VertexFormat inputLayout[], const gl::Framebuffer *framebuffer, gl::Error Renderer9::applyShaders(gl::Program *program,
bool rasterizerDiscard, bool transformFeedbackActive) const gl::Framebuffer *framebuffer,
bool rasterizerDiscard,
bool transformFeedbackActive)
{ {
ASSERT(!transformFeedbackActive); ASSERT(!transformFeedbackActive);
ASSERT(!rasterizerDiscard); ASSERT(!rasterizerDiscard);
ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program); ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
const auto &inputLayout = programD3D->getCachedInputLayout();
ShaderExecutableD3D *vertexExe = NULL; ShaderExecutableD3D *vertexExe = NULL;
gl::Error error = programD3D->getVertexExecutableForInputLayout(inputLayout, &vertexExe, nullptr); gl::Error error = programD3D->getVertexExecutableForInputLayout(inputLayout, &vertexExe, nullptr);
...@@ -2927,14 +2930,14 @@ bool Renderer9::getLUID(LUID *adapterLuid) const ...@@ -2927,14 +2930,14 @@ bool Renderer9::getLUID(LUID *adapterLuid) const
return false; return false;
} }
VertexConversionType Renderer9::getVertexConversionType(const gl::VertexFormat &vertexFormat) const VertexConversionType Renderer9::getVertexConversionType(gl::VertexFormatType vertexFormatType) const
{ {
return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormat).conversionType; return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatType).conversionType;
} }
GLenum Renderer9::getVertexComponentType(const gl::VertexFormat &vertexFormat) const GLenum Renderer9::getVertexComponentType(gl::VertexFormatType vertexFormatType) const
{ {
return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormat).componentType; return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatType).componentType;
} }
void Renderer9::generateCaps(gl::Caps *outCaps, gl::TextureCapsMap *outTextureCaps, gl::Extensions *outExtensions) const void Renderer9::generateCaps(gl::Caps *outCaps, gl::TextureCapsMap *outTextureCaps, gl::Extensions *outExtensions) const
......
src/libANGLE/renderer/d3d/d3d9/Renderer9.h
...@@ -106,8 +106,10 @@ class Renderer9 : public RendererD3D ...@@ -106,8 +106,10 @@ class Renderer9 : public RendererD3D
gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) override; gl::Error applyRenderTarget(const gl::Framebuffer *frameBuffer) override;
gl::Error applyRenderTarget(const gl::FramebufferAttachment *colorAttachment, gl::Error applyRenderTarget(const gl::FramebufferAttachment *colorAttachment,
const gl::FramebufferAttachment *depthStencilAttachment); const gl::FramebufferAttachment *depthStencilAttachment);
virtual gl::Error applyShaders(gl::Program *program, const gl::VertexFormat inputLayout[], const gl::Framebuffer *framebuffer, gl::Error applyShaders(gl::Program *program,
bool rasterizerDiscard, bool transformFeedbackActive); const gl::Framebuffer *framebuffer,
bool rasterizerDiscard,
bool transformFeedbackActive) override;
virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray); virtual gl::Error applyUniforms(const ProgramImpl &program, const std::vector<gl::LinkedUniform*> &uniformArray);
virtual bool applyPrimitiveType(GLenum primitiveType, GLsizei elementCount, bool usesPointSize); virtual bool applyPrimitiveType(GLenum primitiveType, GLsizei elementCount, bool usesPointSize);
virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceInfo); virtual gl::Error applyVertexBuffer(const gl::State &state, GLenum mode, GLint first, GLsizei count, GLsizei instances, SourceIndexData *sourceInfo);
...@@ -225,8 +227,8 @@ class Renderer9 : public RendererD3D ...@@ -225,8 +227,8 @@ class Renderer9 : public RendererD3D
D3DPOOL getTexturePool(DWORD usage) const; D3DPOOL getTexturePool(DWORD usage) const;
bool getLUID(LUID *adapterLuid) const override; bool getLUID(LUID *adapterLuid) const override;
virtual VertexConversionType getVertexConversionType(const gl::VertexFormat &vertexFormat) const; VertexConversionType getVertexConversionType(gl::VertexFormatType vertexFormatType) const override;
virtual GLenum getVertexComponentType(const gl::VertexFormat &vertexFormat) const; GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const override;
gl::Error copyToRenderTarget(IDirect3DSurface9 *dest, IDirect3DSurface9 *source, bool fromManaged); gl::Error copyToRenderTarget(IDirect3DSurface9 *dest, IDirect3DSurface9 *source, bool fromManaged);
......
src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
...@@ -96,8 +96,8 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib ...@@ -96,8 +96,8 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib
input += inputStride * start; input += inputStride * start;
} }
gl::VertexFormat vertexFormat(attrib, currentValueType); gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
const d3d9::VertexFormat &d3dVertexInfo = d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormat); const d3d9::VertexFormat &d3dVertexInfo = d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormatType);
bool needsConversion = (d3dVertexInfo.conversionType & VERTEX_CONVERT_CPU) > 0; bool needsConversion = (d3dVertexInfo.conversionType & VERTEX_CONVERT_CPU) > 0;
if (!needsConversion && inputStride == elementSize) if (!needsConversion && inputStride == elementSize)
...@@ -171,8 +171,8 @@ IDirect3DVertexBuffer9 * VertexBuffer9::getBuffer() const ...@@ -171,8 +171,8 @@ IDirect3DVertexBuffer9 * VertexBuffer9::getBuffer() const
gl::Error VertexBuffer9::spaceRequired(const gl::VertexAttribute &attrib, std::size_t count, GLsizei instances, gl::Error VertexBuffer9::spaceRequired(const gl::VertexAttribute &attrib, std::size_t count, GLsizei instances,
unsigned int *outSpaceRequired) const unsigned int *outSpaceRequired) const
{ {
gl::VertexFormat vertexFormat(attrib, GL_FLOAT); gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, GL_FLOAT);
const d3d9::VertexFormat &d3d9VertexInfo = d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormat); const d3d9::VertexFormat &d3d9VertexInfo = d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormatType);
if (attrib.enabled) if (attrib.enabled)
{ {
......
src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
// VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations. // VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations.
#include "libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h" #include "libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h"
#include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
#include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
namespace rx namespace rx
{ {
...@@ -154,8 +156,8 @@ gl::Error VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device, ...@@ -154,8 +156,8 @@ gl::Error VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device,
mAppliedVBs[stream].offset = attributes[i].offset; mAppliedVBs[stream].offset = attributes[i].offset;
} }
gl::VertexFormat vertexFormat(*attributes[i].attribute, GL_FLOAT); gl::VertexFormatType vertexformatType = gl::GetVertexFormatType(*attributes[i].attribute, GL_FLOAT);
const d3d9::VertexFormat &d3d9VertexInfo = d3d9::GetVertexFormatInfo(caps.DeclTypes, vertexFormat); const d3d9::VertexFormat &d3d9VertexInfo = d3d9::GetVertexFormatInfo(caps.DeclTypes, vertexformatType);
element->Stream = static_cast<WORD>(stream); element->Stream = static_cast<WORD>(stream);
element->Offset = 0; element->Offset = 0;
......
src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
...@@ -555,7 +555,7 @@ static inline unsigned int ComputeTypeIndex(GLenum type) ...@@ -555,7 +555,7 @@ static inline unsigned int ComputeTypeIndex(GLenum type)
} }
} }
const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, const gl::VertexFormat &vertexFormat) const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexFormatType vertexFormatType)
{ {
static bool initialized = false; static bool initialized = false;
static DWORD initializedDeclTypes = 0; static DWORD initializedDeclTypes = 0;
...@@ -592,9 +592,11 @@ const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, const gl::Vert ...@@ -592,9 +592,11 @@ const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, const gl::Vert
initializedDeclTypes = supportedDeclTypes; initializedDeclTypes = supportedDeclTypes;
} }
const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromType(vertexFormatType);
// Pure integer attributes only supported in ES3.0 // Pure integer attributes only supported in ES3.0
ASSERT(!vertexFormat.mPureInteger); ASSERT(!vertexFormat.pureInteger);
return formatConverters[ComputeTypeIndex(vertexFormat.mType)][vertexFormat.mNormalized][vertexFormat.mComponents - 1]; return formatConverters[ComputeTypeIndex(vertexFormat.type)][vertexFormat.normalized][vertexFormat.components - 1];
} }
} }
......
src/libANGLE/renderer/d3d/d3d9/formatutils9.h
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
#define LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_ #define LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
#include "libANGLE/renderer/d3d/formatutilsD3D.h" #include <map>
#include "libANGLE/angletypes.h"
#include "common/platform.h" #include "common/platform.h"
#include "libANGLE/angletypes.h"
#include <map> #include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h"
namespace rx namespace rx
{ {
...@@ -64,7 +64,7 @@ struct VertexFormat ...@@ -64,7 +64,7 @@ struct VertexFormat
D3DDECLTYPE nativeFormat; D3DDECLTYPE nativeFormat;
GLenum componentType; GLenum componentType;
}; };
const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, const gl::VertexFormat &vertexFormat); const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexFormatType vertexFormatType);
struct TextureFormat struct TextureFormat
{ {
......
src/tests/perf_tests/IndexDataManagerTest.cpp
...@@ -54,8 +54,8 @@ class MockBufferFactoryD3D : public rx::BufferFactoryD3D ...@@ -54,8 +54,8 @@ class MockBufferFactoryD3D : public rx::BufferFactoryD3D
} }
MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer*()); MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer*());
MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(const gl::VertexFormat &)); MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(gl::VertexFormatType));
MOCK_CONST_METHOD1(getVertexComponentType, GLenum(const gl::VertexFormat &)); MOCK_CONST_METHOD1(getVertexComponentType, GLenum(gl::VertexFormatType));
// Dependency injection // Dependency injection
rx::IndexBuffer* createIndexBuffer() override rx::IndexBuffer* createIndexBuffer() override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment