libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-01 21:26:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of opengl include from sceDisplay.cpp

Browse Source
This commit is contained in:
Henrik Rydgard 2012-11-18 13:14:22 +01:00
parent e37a1fb1d3
commit 5596b98529
5 changed files with 12 additions and 16 deletions

18
Core/HLE/sceDisplay.cpp

@ -15,18 +15,6 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#if defined(ANDROID) || defined(BLACKBERRY)
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#else
#include <GL/glew.h>
#if defined(__APPLE__)
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#endif
#include <vector>
//#include "base/timeutil.h"
@ -46,7 +34,7 @@
#include "../../GPU/GLES/Framebuffer.h"
#include "../../GPU/GLES/ShaderManager.h"
#include "../../GPU/GPUState.h"
#include "../../GPU/GPUInterface.h"
// Internal drawing library
#include "../Util/PPGeDraw.h"
@ -190,9 +178,7 @@ u32 sceDisplaySetMode(u32 unknown, u32 xres, u32 yres)
DEBUG_LOG(HLE,"sceDisplaySetMode(%d,%d,%d)",unknown,xres,yres);
host->BeginFrame();
glClearColor(0,0,0,1);
// glClearColor(1,0,1,1);
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
gpu->InitClear();
return 0;
}

7
GPU/GLES/DisplayListInterpreter.cpp

@ -76,6 +76,13 @@ bool finished;
u8 bezierBuf[16000];
void GLES_GPU::InitClear()
{
glClearColor(0,0,0,1);
// glClearColor(1,0,1,1);
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
}
bool GLES_GPU::ProcessDLQueue()
{
std::vector<DisplayList>::iterator iter = dlQueue.begin();

1
GPU/GLES/DisplayListInterpreter.h

@ -25,6 +25,7 @@ class GLES_GPU : public GPUInterface
{
public:
GLES_GPU() : interruptsEnabled_(true) {}
virtual void InitClear();
virtual u32 EnqueueList(u32 listpc, u32 stall);
virtual void UpdateStall(int listid, u32 newstall);
virtual void ExecuteOp(u32 op, u32 diff);

1
GPU/GPUInterface.h

@ -22,6 +22,7 @@
class GPUInterface
{
public:
virtual void InitClear() = 0;
virtual u32 EnqueueList(u32 listpc, u32 stall) = 0;
virtual void UpdateStall(int listid, u32 newstall) = 0;
virtual void ExecuteOp(u32 op, u32 diff) = 0;

1
GPU/Null/NullGpu.h

@ -25,6 +25,7 @@ class NullGPU : public GPUInterface
{
public:
NullGPU() : interruptsEnabled_(true) {}
virtual void InitClear() {}
virtual u32 EnqueueList(u32 listpc, u32 stall);
virtual void UpdateStall(int listid, u32 newstall);
virtual void ExecuteOp(u32 op, u32 diff);