Skip to content
Permalink
Browse files

Remove old RasterFont classes

  • Loading branch information...
stenzek committed Oct 9, 2018
1 parent 600d1fc commit 63dd91628de0c9e8c7a25c403b7900675c515d36
Showing with 4 additions and 1,296 deletions.
  1. +0 −390 Source/Core/VideoBackends/D3D/D3DUtil.cpp
  2. +0 −2 Source/Core/VideoBackends/D3D/D3DUtil.h
  3. +0 −7 Source/Core/VideoBackends/D3D/Render.cpp
  4. +0 −2 Source/Core/VideoBackends/D3D/Render.h
  5. +0 −5 Source/Core/VideoBackends/Null/Render.cpp
  6. +0 −1 Source/Core/VideoBackends/Null/Render.h
  7. +0 −1 Source/Core/VideoBackends/OGL/CMakeLists.txt
  8. +0 −2 Source/Core/VideoBackends/OGL/OGL.vcxproj
  9. +0 −9 Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
  10. +0 −5 Source/Core/VideoBackends/OGL/PostProcessing.cpp
  11. +0 −291 Source/Core/VideoBackends/OGL/RasterFont.cpp
  12. +0 −30 Source/Core/VideoBackends/OGL/RasterFont.h
  13. +0 −20 Source/Core/VideoBackends/OGL/Render.cpp
  14. +0 −2 Source/Core/VideoBackends/OGL/Render.h
  15. +0 −11 Source/Core/VideoBackends/Software/SWOGLWindow.cpp
  16. +0 −11 Source/Core/VideoBackends/Software/SWOGLWindow.h
  17. +0 −5 Source/Core/VideoBackends/Software/SWRenderer.cpp
  18. +0 −1 Source/Core/VideoBackends/Software/SWRenderer.h
  19. +0 −1 Source/Core/VideoBackends/Vulkan/CMakeLists.txt
  20. +1 −8 Source/Core/VideoBackends/Vulkan/PostProcessing.cpp
  21. +1 −2 Source/Core/VideoBackends/Vulkan/PostProcessing.h
  22. +0 −421 Source/Core/VideoBackends/Vulkan/RasterFont.cpp
  23. +0 −41 Source/Core/VideoBackends/Vulkan/RasterFont.h
  24. +1 −21 Source/Core/VideoBackends/Vulkan/Renderer.cpp
  25. +0 −3 Source/Core/VideoBackends/Vulkan/Renderer.h
  26. +0 −2 Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
  27. +1 −0 Source/Core/VideoCommon/CMakeLists.txt
  28. +0 −2 Source/Core/VideoCommon/RenderBase.h

Large diffs are not rendered by default.

@@ -28,7 +28,5 @@ void drawClearQuad(u32 Color, float z);
void drawColorQuad(u32 Color, float z, float x1, float y1, float x2, float y2);

void DrawEFBPokeQuads(EFBAccessType type, const EfbPokeData* points, size_t num_points);
void DrawTextScaled(float x, float y, float size, float spacing, u32 color,
const std::string& text);
}
}
@@ -237,13 +237,6 @@ Renderer::CreateFramebuffer(const AbstractTexture* color_attachment,
static_cast<const DXTexture*>(depth_attachment));
}

void Renderer::RenderText(const std::string& text, int left, int top, u32 color)
{
D3D::DrawTextScaled(static_cast<float>(left + 1), static_cast<float>(top + 1), 20.f, 0.0f,
color & 0xFF000000, text);
D3D::DrawTextScaled(static_cast<float>(left), static_cast<float>(top), 20.f, 0.0f, color, text);
}

std::unique_ptr<AbstractShader> Renderer::CreateShaderFromSource(ShaderStage stage,
const char* source, size_t length)
{
@@ -55,8 +55,6 @@ class Renderer : public ::Renderer
void SetFullscreen(bool enable_fullscreen) override;
bool IsFullscreen() const override;

void RenderText(const std::string& text, int left, int top, u32 color) override;

u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override;
void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override;

@@ -82,11 +82,6 @@ Renderer::CreateFramebuffer(const AbstractTexture* color_attachment,
static_cast<const NullTexture*>(depth_attachment));
}

void Renderer::RenderText(const std::string& text, int left, int top, u32 color)
{
NOTICE_LOG(VIDEO, "RenderText: %s", text.c_str());
}

TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
{
TargetRectangle result;
@@ -29,7 +29,6 @@ class Renderer : public ::Renderer
size_t length) override;
std::unique_ptr<AbstractPipeline> CreatePipeline(const AbstractPipelineConfig& config) override;

void RenderText(const std::string& pstr, int left, int top, u32 color) override;
u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override { return 0; }
void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override {}
u16 BBoxRead(int index) override { return 0; }
@@ -9,7 +9,6 @@ add_library(videoogl
PerfQuery.cpp
PostProcessing.cpp
ProgramShaderCache.cpp
RasterFont.cpp
Render.cpp
SamplerCache.cpp
StreamBuffer.cpp
@@ -46,7 +46,6 @@
<ClCompile Include="PerfQuery.cpp" />
<ClCompile Include="PostProcessing.cpp" />
<ClCompile Include="ProgramShaderCache.cpp" />
<ClCompile Include="RasterFont.cpp" />
<ClCompile Include="Render.cpp" />
<ClCompile Include="SamplerCache.cpp" />
<ClCompile Include="StreamBuffer.cpp" />
@@ -64,7 +63,6 @@
<ClInclude Include="PerfQuery.h" />
<ClInclude Include="PostProcessing.h" />
<ClInclude Include="ProgramShaderCache.h" />
<ClInclude Include="RasterFont.h" />
<ClInclude Include="Render.h" />
<ClInclude Include="SamplerCache.h" />
<ClInclude Include="StreamBuffer.h" />
@@ -7,9 +7,6 @@
<Filter Include="GLUtil">
<UniqueIdentifier>{5bfec41c-1031-4925-8f98-38c7b49b1924}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{00dadfd8-a906-4b0c-b415-d42a69cf3ca7}</UniqueIdentifier>
</Filter>
<Filter Include="Render">
<UniqueIdentifier>{696df73b-378e-4399-8f21-999b65d78dcd}</UniqueIdentifier>
</Filter>
@@ -24,9 +21,6 @@
<ClCompile Include="TextureConverter.cpp">
<Filter>GLUtil</Filter>
</ClCompile>
<ClCompile Include="RasterFont.cpp">
<Filter>Logging</Filter>
</ClCompile>
<ClCompile Include="BoundingBox.cpp">
<Filter>Render</Filter>
</ClCompile>
@@ -70,9 +64,6 @@
<ClInclude Include="TextureConverter.h">
<Filter>GLUtil</Filter>
</ClInclude>
<ClInclude Include="RasterFont.h">
<Filter>Logging</Filter>
</ClInclude>
<ClInclude Include="BoundingBox.h">
<Filter>Render</Filter>
</ClInclude>
@@ -198,11 +198,6 @@ void OpenGLPostProcessing::CreateHeader()

"#define SampleOffset(offset) textureOffset(samp9, float3(uv0, layer), offset)\n"

"float4 SampleFontLocation(float2 location)\n"
"{\n"
"\treturn texture(samp8, location);\n"
"}\n"

"float2 GetResolution()\n"
"{\n"
"\treturn resolution.xy;\n"

0 comments on commit 63dd916

Please sign in to comment.
You can’t perform that action at this time.