Skip to content

A
angle
Commit 50aadb05 by daniel@transgaming.com
Options

Moved D3DConstantTable, IndexDataManager, VertexDataManager and vertexconversion files.

TRAC #22198 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1547 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 25e16afc
Showing with 171 additions and 180 deletions
src/libGLESv2/Buffer.cpp
......@@ -11,8 +11,6 @@
#include "libGLESv2/Buffer.h"
#include "libGLESv2/main.h"
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/IndexDataManager.h"
namespace gl
{
......
src/libGLESv2/ProgramBinary.h
......@@ -19,7 +19,6 @@
#include "libGLESv2/Program.h"
#include "libGLESv2/Context.h"
#include "libGLESv2/D3DConstantTable.h"
#include "libGLESv2/mathutil.h"
#include "libGLESv2/Shader.h"
......
src/libGLESv2/libGLESv2.vcxproj
......@@ -229,26 +229,26 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp" />
<ClCompile Include="Buffer.cpp" />
<ClCompile Include="Context.cpp" />
<ClCompile Include="..\common\debug.cpp" />
<ClCompile Include="D3DConstantTable.cpp" />
<ClCompile Include="Fence.cpp" />
<ClCompile Include="Float16ToFloat32.cpp" />
<ClCompile Include="Framebuffer.cpp" />
<ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="IndexDataManager.cpp" />
<ClCompile Include="libGLESv2.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" />
<ClCompile Include="Buffer.cpp" />
<ClCompile Include="Context.cpp" />
<ClCompile Include="..\common\debug.cpp" />
<ClCompile Include="Fence.cpp" />
<ClCompile Include="Float16ToFloat32.cpp" />
<ClCompile Include="Framebuffer.cpp" />
<ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="libGLESv2.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" />
<ClCompile Include="ProgramBinary.cpp" />
<ClCompile Include="Query.cpp" />
<ClCompile Include="..\common\RefCountObject.cpp" />
<ClCompile Include="Renderbuffer.cpp" />
<ClCompile Include="renderer\Blit.cpp" />
<ClCompile Include="renderer\Renderer.cpp" />
<ClCompile Include="renderer\Renderer11.cpp" />
<ClCompile Include="renderer\renderer11_utils.cpp" />
<ClCompile Include="..\common\RefCountObject.cpp" />
<ClCompile Include="Renderbuffer.cpp" />
<ClCompile Include="renderer\Blit.cpp" />
<ClCompile Include="renderer\D3DConstantTable.cpp" />
<ClCompile Include="renderer\IndexDataManager.cpp" />
<ClCompile Include="renderer\Renderer.cpp" />
<ClCompile Include="renderer\Renderer11.cpp" />
<ClCompile Include="renderer\renderer11_utils.cpp" />
<ClCompile Include="renderer\Renderer9.cpp" />
<ClCompile Include="renderer\Image.cpp" />
<ClCompile Include="renderer\renderer9_utils.cpp" />
......@@ -257,43 +257,43 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClCompile Include="renderer\RenderStateCache.cpp" />
<ClCompile Include="renderer\ShaderExecutable11.cpp" />
<ClCompile Include="renderer\ShaderExecutable9.cpp" />
<ClCompile Include="renderer\SwapChain11.cpp" />
<ClCompile Include="renderer\SwapChain9.cpp" />
<ClCompile Include="renderer\TextureStorage.cpp" />
<ClCompile Include="renderer\VertexDeclarationCache.cpp" />
<ClCompile Include="ResourceManager.cpp" />
<ClCompile Include="Shader.cpp" />
<ClCompile Include="Texture.cpp" />
<ClCompile Include="TextureSSE2.cpp" />
<ClCompile Include="utilities.cpp" />
<ClCompile Include="VertexDataManager.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
<ClCompile Include="renderer\SwapChain11.cpp" />
<ClCompile Include="renderer\SwapChain9.cpp" />
<ClCompile Include="renderer\TextureStorage.cpp" />
<ClCompile Include="renderer\VertexDataManager.cpp" />
<ClCompile Include="renderer\VertexDeclarationCache.cpp" />
<ClCompile Include="ResourceManager.cpp" />
<ClCompile Include="Shader.cpp" />
<ClCompile Include="Texture.cpp" />
<ClCompile Include="TextureSSE2.cpp" />
<ClCompile Include="utilities.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
<ClInclude Include="angletypes.h" />
<ClInclude Include="BinaryStream.h" />
<ClInclude Include="Buffer.h" />
<ClInclude Include="Context.h" />
<ClInclude Include="D3DConstantTable.h" />
<ClInclude Include="Fence.h" />
<ClInclude Include="Framebuffer.h" />
<ClInclude Include="..\..\include\GLES2\gl2.h" />
<ClInclude Include="..\..\include\GLES2\gl2ext.h" />
<ClInclude Include="..\..\include\GLES2\gl2platform.h" />
<ClInclude Include="HandleAllocator.h" />
<ClInclude Include="IndexDataManager.h" />
<ClInclude Include="main.h" />
<ClInclude Include="mathutil.h" />
<ClInclude Include="Program.h" />
<ClInclude Include="BinaryStream.h" />
<ClInclude Include="Buffer.h" />
<ClInclude Include="Context.h" />
<ClInclude Include="Fence.h" />
<ClInclude Include="Framebuffer.h" />
<ClInclude Include="..\..\include\GLES2\gl2.h" />
<ClInclude Include="..\..\include\GLES2\gl2ext.h" />
<ClInclude Include="..\..\include\GLES2\gl2platform.h" />
<ClInclude Include="HandleAllocator.h" />
<ClInclude Include="main.h" />
<ClInclude Include="mathutil.h" />
<ClInclude Include="Program.h" />
<ClInclude Include="ProgramBinary.h" />
<ClInclude Include="Query.h" />
<ClInclude Include="..\common\RefCountObject.h" />
<ClInclude Include="Renderbuffer.h" />
<ClInclude Include="renderer\Blit.h" />
<ClInclude Include="renderer\Image.h" />
<ClInclude Include="renderer\Renderer.h" />
<ClInclude Include="renderer\Renderer11.h" />
<ClInclude Include="renderer\renderer11_utils.h" />
<ClInclude Include="..\common\RefCountObject.h" />
<ClInclude Include="Renderbuffer.h" />
<ClInclude Include="renderer\Blit.h" />
<ClInclude Include="renderer\D3DConstantTable.h" />
<ClInclude Include="renderer\Image.h" />
<ClInclude Include="renderer\IndexDataManager.h" />
<ClInclude Include="renderer\Renderer.h" />
<ClInclude Include="renderer\Renderer11.h" />
<ClInclude Include="renderer\renderer11_utils.h" />
<ClInclude Include="renderer\Renderer9.h" />
<ClInclude Include="renderer\renderer9_utils.h" />
<ClInclude Include="renderer\RenderTarget.h" />
......@@ -305,21 +305,21 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="renderer\ShaderExecutable11.h" />
<ClInclude Include="renderer\ShaderExecutable9.h" />
<ClInclude Include="renderer\SwapChain.h" />
<ClInclude Include="renderer\SwapChain11.h" />
<ClInclude Include="renderer\SwapChain9.h" />
<ClInclude Include="renderer\TextureStorage.h" />
<ClInclude Include="renderer\VertexDeclarationCache.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="ResourceManager.h" />
<ClInclude Include="renderer\SwapChain11.h" />
<ClInclude Include="renderer\SwapChain9.h" />
<ClInclude Include="renderer\TextureStorage.h" />
<ClInclude Include="renderer\vertexconversion.h" />
<ClInclude Include="renderer\VertexDataManager.h" />
<ClInclude Include="renderer\VertexDeclarationCache.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="ResourceManager.h" />
<ClInclude Include="Shader.h" />
<ClInclude Include="Texture.h" />
<ClInclude Include="utilities.h" />
<ClInclude Include="..\common\version.h" />
<ClInclude Include="vertexconversion.h" />
<ClInclude Include="VertexDataManager.h" />
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def" />
<ClInclude Include="Texture.h" />
<ClInclude Include="utilities.h" />
<ClInclude Include="..\common\version.h" />
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libGLESv2.rc" />
......
src/libGLESv2/libGLESv2.vcxproj.filters
......@@ -26,30 +26,24 @@
<ClCompile Include="Context.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\common\debug.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="D3DConstantTable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Fence.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\common\debug.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Fence.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Float16ToFloat32.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Framebuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="HandleAllocator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="IndexDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="libGLESv2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="HandleAllocator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="libGLESv2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
......@@ -80,15 +74,12 @@
<ClCompile Include="TextureSSE2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="utilities.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VertexDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="renderer\Renderer9.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="utilities.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="renderer\Renderer9.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\Image.cpp">
<Filter>Renderer</Filter>
</ClCompile>
......@@ -130,30 +121,33 @@
</ClCompile>
<ClCompile Include="renderer\VertexDeclarationCache.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\ShaderExecutable9.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\ShaderExecutable11.cpp">
<Filter>Renderer</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BinaryStream.h">
</ClCompile>
<ClCompile Include="renderer\ShaderExecutable9.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\D3DConstantTable.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\IndexDataManager.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\VertexDataManager.cpp">
<Filter>Renderer</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BinaryStream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Buffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Context.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="D3DConstantTable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Fence.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Context.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Fence.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Framebuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
......@@ -166,15 +160,12 @@
<ClInclude Include="..\..\include\GLES2\gl2platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HandleAllocator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IndexDataManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HandleAllocator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mathutil.h">
<Filter>Header Files</Filter>
</ClInclude>
......@@ -208,18 +199,12 @@
<ClInclude Include="utilities.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\common\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="vertexconversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VertexDataManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="renderer\ShaderCache.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="..\common\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="renderer\ShaderCache.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\Renderer.h">
<Filter>Renderer</Filter>
</ClInclude>
......@@ -276,16 +261,25 @@
</ClInclude>
<ClInclude Include="renderer\ShaderExecutable.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\ShaderExecutable9.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\ShaderExecutable11.h">
<Filter>Renderer</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def">
</ClInclude>
<ClInclude Include="renderer\ShaderExecutable9.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\VertexDataManager.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\D3DConstantTable.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\IndexDataManager.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\vertexconversion.h">
<Filter>Renderer</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def">
<Filter>Source Files</Filter>
</None>
</ItemGroup>
......
src/libGLESv2/D3DConstantTable.cpp → src/libGLESv2/renderer/D3DConstantTable.cpp
......@@ -9,7 +9,7 @@
// Restructures the constant table as a hierarchy of constants in the same
// way as D3DX.
#include "libGLESv2/D3DConstantTable.h"
#include "libGLESv2/renderer/D3DConstantTable.h"
#include <d3d9.h>
#include <d3d9types.h>
......
src/libGLESv2/D3DConstantTable.h → src/libGLESv2/renderer/D3DConstantTable.h
......@@ -72,7 +72,7 @@ struct D3DConstant
PT_VERTEXFRAGMENT,
PT_UNSUPPORTED,
};
D3DConstant(const char *base, const ctab::ConstantInfo *constantInfo);
~D3DConstant();
......@@ -87,7 +87,7 @@ struct D3DConstant
unsigned elements;
// Array of structure members.
std::vector<std::vector<const D3DConstant*> > structMembers;
std::vector<std::vector<const D3DConstant*> > structMembers;
private:
D3DConstant(const char *base, RegisterSet registerSet, unsigned registerIndex, const ctab::StructMemberInfo *memberInfo);
......
src/libGLESv2/IndexDataManager.cpp → src/libGLESv2/renderer/IndexDataManager.cpp
......@@ -7,7 +7,7 @@
// IndexDataManager.cpp: Defines the IndexDataManager, a class that
// runs the Buffer translation process for index buffers.
#include "libGLESv2/IndexDataManager.h"
#include "libGLESv2/renderer/IndexDataManager.h"
#include "common/debug.h"
......@@ -173,13 +173,13 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, Buffer *bu
}
void *output = NULL;
if (indexBuffer)
{
indexBuffer->reserveSpace(convertCount * indexSize(format), type);
output = indexBuffer->map(indexSize(format) * convertCount, &streamOffset);
}
if (output == NULL)
{
ERR("Failed to map index buffer.");
......@@ -240,7 +240,7 @@ StaticIndexBuffer *IndexDataManager::getCountingIndices(GLsizei count)
UINT offset;
unsigned short *data = static_cast<unsigned short*>(mCountingBuffer->map(spaceNeeded, &offset));
if (data)
{
for(int i = 0; i < count; i++)
......@@ -264,20 +264,20 @@ StaticIndexBuffer *IndexDataManager::getCountingIndices(GLsizei count)
UINT offset;
unsigned int *data = static_cast<unsigned int*>(mCountingBuffer->map(spaceNeeded, &offset));
if (data)
{
for(int i = 0; i < count; i++)
{
data[i] = i;
}
mCountingBuffer->unmap();
}
}
}
else return NULL;
return mCountingBuffer;
}
......@@ -343,7 +343,7 @@ void *StreamingIndexBuffer::map(UINT requiredSpace, UINT *offset)
if (mIndexBuffer)
{
HRESULT result = mIndexBuffer->Lock(mWritePosition, requiredSpace, &mapPtr, D3DLOCK_NOOVERWRITE);
if (FAILED(result))
{
ERR(" Lock failed with error 0x%08x", result);
......@@ -372,7 +372,7 @@ void StreamingIndexBuffer::reserveSpace(UINT requiredSpace, GLenum type)
// D3D9_REPLACE
HRESULT result = mRenderer->createIndexBuffer(mBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, type == GL_UNSIGNED_INT ? D3DFMT_INDEX32 : D3DFMT_INDEX16, &mIndexBuffer);
mSerial = issueSerial();
if (FAILED(result))
{
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize);
......@@ -406,7 +406,7 @@ void *StaticIndexBuffer::map(UINT requiredSpace, UINT *offset)
if (mIndexBuffer)
{
HRESULT result = mIndexBuffer->Lock(0, requiredSpace, &mapPtr, 0);
if (FAILED(result))
{
ERR(" Lock failed with error 0x%08x", result);
......@@ -426,7 +426,7 @@ void StaticIndexBuffer::reserveSpace(UINT requiredSpace, GLenum type)
// D3D9_REPLACE
HRESULT result = mRenderer->createIndexBuffer(requiredSpace, D3DUSAGE_WRITEONLY, type == GL_UNSIGNED_INT ? D3DFMT_INDEX32 : D3DFMT_INDEX16, &mIndexBuffer);
mSerial = issueSerial();
if (FAILED(result))
{
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize);
......@@ -452,7 +452,7 @@ UINT StaticIndexBuffer::lookupRange(intptr_t offset, GLsizei count, UINT *minInd
IndexRange range = {offset, count};
std::map<IndexRange, IndexResult>::iterator res = mCache.find(range);
if (res == mCache.end())
{
return -1;
......
src/libGLESv2/IndexDataManager.h → src/libGLESv2/renderer/IndexDataManager.h
......@@ -89,7 +89,7 @@ class StaticIndexBuffer : public IndexBuffer
private:
GLenum mCacheType;
struct IndexRange
{
intptr_t offset;
......
src/libGLESv2/renderer/Renderer9.cpp
......@@ -14,8 +14,8 @@
#include "libGLESv2/Framebuffer.h"
#include "libGLESv2/Program.h"
#include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/IndexDataManager.h"
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/renderer/IndexDataManager.h"
#include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/renderer/ShaderExecutable9.h"
......
src/libGLESv2/renderer/Renderer9.h
......@@ -26,7 +26,7 @@
#include "libGLESv2/renderer/ShaderCache.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h"
#include "libGLESv2/renderer/Renderer.h"
#include "libGLESv2/IndexDataManager.h"
#include "libGLESv2/renderer/IndexDataManager.h"
namespace gl
{
......
src/libGLESv2/renderer/ShaderExecutable.h
......@@ -11,7 +11,7 @@
#define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_
#include "common/angleutils.h"
#include "libGLESv2/D3DConstantTable.h"
#include "libGLESv2/renderer/D3DConstantTable.h"
namespace rx
{
......
src/libGLESv2/renderer/ShaderExecutable9.h
......@@ -13,7 +13,7 @@
#include <d3d9.h>
#include "libGLESv2/renderer/ShaderExecutable.h"
#include "libGLESv2/D3DConstantTable.h"
#include "libGLESv2/renderer/D3DConstantTable.h"
namespace rx
{
......
src/libGLESv2/VertexDataManager.cpp → src/libGLESv2/renderer/VertexDataManager.cpp
......@@ -7,7 +7,7 @@
// VertexDataManager.h: Defines the VertexDataManager, a class that
// runs the Buffer translation process.
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDataManager.h"
#include "common/debug.h"
......@@ -16,8 +16,8 @@
#include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/main.h"
#include "libGLESv2/vertexconversion.h"
#include "libGLESv2/IndexDataManager.h"
#include "libGLESv2/renderer/vertexconversion.h"
#include "libGLESv2/renderer/IndexDataManager.h"
#include <limits>
......@@ -81,7 +81,7 @@ std::size_t VertexDataManager::writeAttributeData(ArrayVertexBuffer *vertexBuffe
std::size_t streamOffset = 0;
void *output = NULL;
if (vertexBuffer)
{
output = vertexBuffer->map(attribute, spaceRequired(attribute, count, instances), &streamOffset);
......@@ -173,7 +173,7 @@ GLenum VertexDataManager::prepareVertexData(const VertexAttribute attribs[], Pro
mStreamingBuffer->addRequiredSpace(spaceRequired(attribs[i], count, instances));
buffer->invalidateStaticData();
}
}
}
else
{
......@@ -349,7 +349,7 @@ std::size_t VertexDataManager::spaceRequired(const VertexAttribute &attrib, std:
// FIXED (not in WebGL) FLOAT (FixedToFloat)
// FLOAT FLOAT (Identity)
// GLToCType maps from GL type (as GLenum) to the C typedef.
// GLToCType maps from GL type (as GLenum) to the C typedef.
template <GLenum GLType> struct GLToCType { };
template <> struct GLToCType<GL_BYTE> { typedef GLbyte type; };
......@@ -471,7 +471,7 @@ struct DefaultVertexValuesStage2
template <class T> struct DefaultVertexValuesStage2<T, true> : gl::NormalizedDefaultValues<T> { };
template <class T> struct DefaultVertexValuesStage2<T, false> : gl::SimpleDefaultValues<T> { };
// Work out the default value rule for a D3D type (expressed as the C type) and
// Work out the default value rule for a D3D type (expressed as the C type) and
template <class T, bool normalized>
struct DefaultVertexValues : DefaultVertexValuesStage2<T, normalized>
{
......@@ -587,7 +587,7 @@ VertexBuffer::VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usag
// D3D9_REPLACE
HRESULT result = mRenderer->createVertexBuffer(size, usageFlags,&mVertexBuffer);
mSerial = issueSerial();
if (FAILED(result))
{
ERR("Out of memory allocating a vertex buffer of size %lu.", size);
......@@ -657,7 +657,7 @@ void *StreamingVertexBuffer::map(const VertexAttribute &attribute, std::size_t r
if (mVertexBuffer)
{
HRESULT result = mVertexBuffer->Lock(mWritePosition, requiredSpace, &mapPtr, D3DLOCK_NOOVERWRITE);
if (FAILED(result))
{
ERR("Lock failed with error 0x%08x", result);
......@@ -686,7 +686,7 @@ void StreamingVertexBuffer::reserveRequiredSpace()
// D3D9_REPLACE
HRESULT result = mRenderer->createVertexBuffer(mBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, &mVertexBuffer);
mSerial = issueSerial();
if (FAILED(result))
{
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize);
......@@ -724,7 +724,7 @@ void *StaticVertexBuffer::map(const VertexAttribute &attribute, std::size_t requ
if (mVertexBuffer)
{
HRESULT result = mVertexBuffer->Lock(mWritePosition, requiredSpace, &mapPtr, 0);
if (FAILED(result))
{
ERR("Lock failed with error 0x%08x", result);
......
src/libGLESv2/renderer/VertexDeclarationCache.cpp
......@@ -7,7 +7,7 @@
// VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations.
#include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h"
namespace rx
......
src/libGLESv2/renderer/VertexDeclarationCache.h
......@@ -10,7 +10,7 @@
#define LIBGLESV2_RENDERER_VERTEXDECLARATIONCACHE_H_
#include "libGLESv2/Context.h"
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDataManager.h"
namespace gl
{
......
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