meow
This commit is contained in:
parent
349d226c19
commit
12f832f404
|
|
@ -178,7 +178,7 @@ void EventThread::process(RGSSThreadData &rtData){
|
||||||
|
|
||||||
while (true){
|
while (true){
|
||||||
if (!SDL_WaitEvent(&event)){
|
if (!SDL_WaitEvent(&event)){
|
||||||
Debug() << "EventThread: Event error";
|
Debug() << "[EventThread::process] EventThread: Event error";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -273,7 +273,7 @@ void EventThread::process(RGSSThreadData &rtData){
|
||||||
case SDL_EVENT_QUIT :
|
case SDL_EVENT_QUIT :
|
||||||
if (rtData.allowExit) {
|
if (rtData.allowExit) {
|
||||||
terminate = true;
|
terminate = true;
|
||||||
Debug() << "EventThread termination requested";
|
Debug() << "[EventThread::process] EventThread termination requested";
|
||||||
} else {
|
} else {
|
||||||
rtData.triedExit.set();
|
rtData.triedExit.set();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -105,8 +105,7 @@ void Shader::unbind(){
|
||||||
glState.program.set(0);
|
glState.program.set(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setupShaderSource(GLuint shader, GLenum type,
|
static void setupShaderSource(GLuint shader, GLenum type, const unsigned char *body, int bodySize){
|
||||||
const unsigned char *body, int bodySize){
|
|
||||||
static const char glesDefine[] = "#define GLSLES\n";
|
static const char glesDefine[] = "#define GLSLES\n";
|
||||||
static const char fragDefine[] = "#define FRAGMENT_SHADER\n";
|
static const char fragDefine[] = "#define FRAGMENT_SHADER\n";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -240,14 +240,12 @@ private:
|
||||||
|
|
||||||
/* Gaussian blur */
|
/* Gaussian blur */
|
||||||
struct BlurShader{
|
struct BlurShader{
|
||||||
class HPass : public ShaderBase
|
class HPass : public ShaderBase{
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
HPass();
|
HPass();
|
||||||
};
|
};
|
||||||
|
|
||||||
class VPass : public ShaderBase
|
class VPass : public ShaderBase{
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
VPass();
|
VPass();
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue