forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from g4z3r/master 

some minor improvements in glsupport.d
This commit is contained in:
Vadim Lopatin 2015-12-11 19:58:48 +03:00
parent a8bcf3f9a7 a3ec66569d
commit 96461c2f1b
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dlangui/graphics/glsupport.d
View File

@ -69,7 +69,9 @@ static this() {
0x0500: "GL_INVALID_ENUM", 0x0500: "GL_INVALID_ENUM",
0x0501: "GL_INVALID_VALUE", 0x0501: "GL_INVALID_VALUE",
0x0502: "GL_INVALID_OPERATION", 0x0502: "GL_INVALID_OPERATION",
0x0505: "GL_OUT_OF_MEMORY" 0x0505: "GL_OUT_OF_MEMORY",
0x0506: "GL_INVALID_FRAMEBUFFER_OPERATION",
0x0507: "GL_CONTEXT_LOST"
]; ];
} }
/** /**
@ -81,7 +83,7 @@ bool checkError(string context="", string file=__FILE__, int line=__LINE__)
GLenum err = glGetError(); GLenum err = glGetError();
if (err != GL_NO_ERROR) if (err != GL_NO_ERROR)
{ {
Log.e("OpenGL error ", err in errors ? errors[err] : to!string(err), " at ", file, ":", line, " -- ", context); Log.e("OpenGL error ", errors.get(err, to!string(err)), " at ", file, ":", line, " -- ", context);
return true; return true;
} }
return false; return false;
@ -122,10 +124,9 @@ class GLProgram {
compatibilityFixes(sourceCode, type); compatibilityFixes(sourceCode, type);
Log.d("compileShader glsl=", glslversion, " type:", (type == GL_VERTEX_SHADER ? "GL_VERTEX_SHADER" : (type == GL_FRAGMENT_SHADER ? "GL_FRAGMENT_SHADER" : "UNKNOWN")), " code:\n", sourceCode); Log.d("compileShader glsl=", glslversion, " type:", (type == GL_VERTEX_SHADER ? "GL_VERTEX_SHADER" : (type == GL_FRAGMENT_SHADER ? "GL_FRAGMENT_SHADER" : "UNKNOWN")), " code:\n", sourceCode);
GLuint shader = glCreateShader(type);//GL_VERTEX_SHADER GLuint shader = glCreateShader(type);
const char * psrc = sourceCode.toStringz; const char * psrc = sourceCode.toStringz;
GLuint len = cast(uint)sourceCode.length; glShaderSource(shader, 1, &psrc, null);
glShaderSource(shader, 1, &psrc, cast(const(int)*)&len);
glCompileShader(shader); glCompileShader(shader);
GLint compiled; GLint compiled;
glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled); glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
@ -139,9 +140,8 @@ class GLProgram {
if (blen > 1) if (blen > 1)
{ {
GLchar[] msg = new GLchar[blen + 1]; GLchar[] msg = new GLchar[blen + 1];
GLchar * pmsg = &msg[0]; glGetShaderInfoLog(shader, blen, &slen, msg.ptr);
glGetShaderInfoLog(shader, blen, &slen, pmsg); Log.d("Shader compilation error: ", fromStringz(msg.ptr));
Log.d("Shader compilation error: ", fromStringz(pmsg));
} }
return 0; return 0;
} }
@ -176,16 +176,13 @@ class GLProgram {
GLint maxLength = 0; GLint maxLength = 0;
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &maxLength); glGetProgramiv(program, GL_INFO_LOG_LENGTH, &maxLength);
GLchar[] msg = new GLchar[maxLength + 1]; GLchar[] msg = new GLchar[maxLength + 1];
GLchar * pmsg = &msg[0]; glGetProgramInfoLog(program, maxLength, &maxLength, msg.ptr);
glGetProgramInfoLog(program, maxLength, &maxLength, pmsg); Log.e("Error while linking program: ", fromStringz(msg.ptr));
Log.e("Error while linking program: ", fromStringz(pmsg));
error = true; error = true;
return false; return false;
} }
Log.d("Program compiled successfully"); Log.d("Program linked successfully");
//glDetachShader(program, vertexShader); Log.v("trying glUseProgram with 0");
//glDetachShader(program, fragmentShader);
Log.v("trying glUseProgram(0)");
glUseProgram(0); glUseProgram(0);
Log.v("before useProgram"); Log.v("before useProgram");
glUseProgram(program); glUseProgram(program);
@ -298,15 +295,15 @@ class SolidFillProgram : GLProgram {
matrixLocation = glGetUniformLocation(program, "matrix"); matrixLocation = glGetUniformLocation(program, "matrix");
checkError("glGetUniformLocation matrix"); checkError("glGetUniformLocation matrix");
if (matrixLocation == 0) if (matrixLocation == -1)
Log.e("glGetUniformLocation failed for matrixLocation"); Log.e("glGetUniformLocation failed for matrixLocation");
vertexLocation = glGetAttribLocation(program, "vertex"); vertexLocation = glGetAttribLocation(program, "vertex");
checkError("glGetAttribLocation vertex"); checkError("glGetAttribLocation vertex");
if (vertexLocation == 0) if (vertexLocation == -1)
Log.e("glGetUniformLocation failed for vertexLocation"); Log.e("glGetUniformLocation failed for vertexLocation");
colAttrLocation = glGetAttribLocation(program, "colAttr"); colAttrLocation = glGetAttribLocation(program, "colAttr");
checkError("glGetAttribLocation colAttr"); checkError("glGetAttribLocation colAttr");
if (colAttrLocation == 0) if (colAttrLocation == -1)
Log.e("glGetUniformLocation failed for colAttrLocation"); Log.e("glGetUniformLocation failed for colAttrLocation");
return res && matrixLocation >= 0 && vertexLocation >= 0 && colAttrLocation >= 0; return res && matrixLocation >= 0 && vertexLocation >= 0 && colAttrLocation >= 0;
} }