diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-14 16:51:21 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-14 16:51:21 +0000 |
| commit | 1c13c9668a889e56a0c85b51b9f28139c25b76ff (patch) | |
| tree | 0319884473e77141a574ab07333c6ed4797f7485 /vs/SampleApp | |
| parent | dd53d91b60e368f1bbff6fb22d796765205ae25d (diff) | |
Refactor how Gr handles vertex and index data. GrGpu and GrInOrderDrawBuffer both GrBufferAllocPool to manage reserved and set-to-array vertex and index data.
rietveld issue 4188049
git-svn-id: http://skia.googlecode.com/svn/trunk@786 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'vs/SampleApp')
| -rw-r--r-- | vs/SampleApp/SampleApp.vcxproj | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vs/SampleApp/SampleApp.vcxproj b/vs/SampleApp/SampleApp.vcxproj index 5acf7da57a..688e59ce6d 100644 --- a/vs/SampleApp/SampleApp.vcxproj +++ b/vs/SampleApp/SampleApp.vcxproj @@ -72,7 +72,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;GR_RELEASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include\core;..\..\include\xml;..\..\include\utils;..\..\include\config;..\..\include\views;..\..\src\core;..\..\include\images;..\..\include\effects;..\..\include\gpu;..\..\include\pdf;..\..\gpu\include</AdditionalIncludeDirectories>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
</ClCompile>
@@ -103,6 +103,7 @@ <ClInclude Include="..\..\gpu\include\GrContext_impl.h" />
<ClInclude Include="..\..\gpu\include\GrDrawTarget.h" />
<ClInclude Include="..\..\gpu\include\GrFontScaler.h" />
+ <ClInclude Include="..\..\gpu\include\GrGeometryBuffer.h" />
<ClInclude Include="..\..\gpu\include\GrGLConfig.h" />
<ClInclude Include="..\..\gpu\include\GrGLIndexBuffer.h" />
<ClInclude Include="..\..\gpu\include\GrGLTexture.h" />
@@ -146,8 +147,8 @@ <ClInclude Include="..\..\gpu\include\GrTypes.h" />
<ClInclude Include="..\..\gpu\include\GrUserConfig.h" />
<ClInclude Include="..\..\gpu\include\GrVertexBuffer.h" />
- <ClInclude Include="..\..\gpu\include\GrVertexBufferAllocPool.h" />
<ClInclude Include="..\..\gpu\include\SkUIView.h" />
+ <ClInclude Include="..\..\gpu\src\GrBufferAllocPool.h" />
<ClInclude Include="..\..\gpu\src\GrGpuGL.h" />
<ClInclude Include="..\..\gpu\src\GrGpuGLFixed.h" />
<ClInclude Include="..\..\gpu\src\GrGpuGLShaders.h" />
@@ -212,6 +213,7 @@ <ClCompile Include="..\..\experimental\SkSetPoly3To3.cpp" />
<ClCompile Include="..\..\gpu\src\GrAllocPool.cpp" />
<ClCompile Include="..\..\gpu\src\GrAtlas.cpp" />
+ <ClCompile Include="..\..\gpu\src\GrBufferAllocPool.cpp" />
<ClCompile Include="..\..\gpu\src\GrClip.cpp" />
<ClCompile Include="..\..\gpu\src\GrContext.cpp" />
<ClCompile Include="..\..\gpu\src\GrDrawTarget.cpp" />
@@ -233,7 +235,6 @@ <ClCompile Include="..\..\gpu\src\GrTextContext.cpp" />
<ClCompile Include="..\..\gpu\src\GrTextStrike.cpp" />
<ClCompile Include="..\..\gpu\src\GrTextureCache.cpp" />
- <ClCompile Include="..\..\gpu\src\GrVertexBufferAllocPool.cpp" />
<ClCompile Include="..\..\gpu\src\gr_unittests.cpp" />
<ClCompile Include="..\..\samplecode\OverView.cpp" />
<ClCompile Include="..\..\samplecode\SampleAll.cpp" />
|