mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 07:39:45 -06:00
Remove old RasterFont classes
This commit is contained in:
@ -84,11 +84,6 @@ bool SWOGLWindow::Initialize(const WindowSystemInfo& wsi)
|
||||
return true;
|
||||
}
|
||||
|
||||
void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color)
|
||||
{
|
||||
m_text.push_back({text, x, y, color});
|
||||
}
|
||||
|
||||
void SWOGLWindow::ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region)
|
||||
{
|
||||
SW::SWTexture* sw_image = static_cast<SW::SWTexture*>(image);
|
||||
@ -116,11 +111,5 @@ void SWOGLWindow::ShowImage(AbstractTexture* image, const EFBRectangle& xfb_regi
|
||||
glBindVertexArray(m_image_vao);
|
||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
||||
|
||||
// TODO: implement OSD
|
||||
// for (TextData& text : m_text)
|
||||
// {
|
||||
// }
|
||||
m_text.clear();
|
||||
|
||||
m_gl_context->Swap();
|
||||
}
|
||||
|
@ -24,9 +24,6 @@ public:
|
||||
GLContext* GetContext() const { return m_gl_context.get(); }
|
||||
bool IsHeadless() const;
|
||||
|
||||
// Will be printed on the *next* image
|
||||
void PrintText(const std::string& text, int x, int y, u32 color);
|
||||
|
||||
// Image to show, will be swapped immediately
|
||||
void ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region);
|
||||
|
||||
@ -37,14 +34,6 @@ private:
|
||||
|
||||
bool Initialize(const WindowSystemInfo& wsi);
|
||||
|
||||
struct TextData
|
||||
{
|
||||
std::string text;
|
||||
int x, y;
|
||||
u32 color;
|
||||
};
|
||||
std::vector<TextData> m_text;
|
||||
|
||||
u32 m_image_program = 0;
|
||||
u32 m_image_texture = 0;
|
||||
u32 m_image_vao = 0;
|
||||
|
@ -55,11 +55,6 @@ SWRenderer::CreateFramebuffer(const AbstractTexture* color_attachment,
|
||||
static_cast<const SW::SWTexture*>(depth_attachment));
|
||||
}
|
||||
|
||||
void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color)
|
||||
{
|
||||
m_window->PrintText(pstr, left, top, color);
|
||||
}
|
||||
|
||||
class SWShader final : public AbstractShader
|
||||
{
|
||||
public:
|
||||
|
@ -32,7 +32,6 @@ public:
|
||||
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;
|
||||
void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override {}
|
||||
u16 BBoxRead(int index) override;
|
||||
|
Reference in New Issue
Block a user