Skip to content

A
angle
Commit cba5057c by daniel@transgaming.com
Options

Compiler - implement shader and program queries

TRAC #11599 Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@76 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent e78c0c99
Showing with 217 additions and 23 deletions
src/libGLESv2/Program.cpp
...@@ -41,6 +41,8 @@ Program::Program() ...@@ -41,6 +41,8 @@ Program::Program()
mAttributeName[index] = NULL; mAttributeName[index] = NULL;
} }
mInfoLog = NULL;
unlink(); unlink();
mDeleteStatus = false; mDeleteStatus = false;
...@@ -107,6 +109,11 @@ bool Program::detachShader(Shader *shader) ...@@ -107,6 +109,11 @@ bool Program::detachShader(Shader *shader)
return true; return true;
} }
int Program::getAttachedShadersCount() const
{
return (mVertexShader ? 1 : 0) + (mFragmentShader ? 1 : 0);
}
IDirect3DPixelShader9 *Program::getPixelShader() IDirect3DPixelShader9 *Program::getPixelShader()
{ {
return mPixelExecutable; return mPixelExecutable;
...@@ -385,6 +392,7 @@ ID3DXBuffer *Program::compileToBinary(const char *hlsl, const char *profile, ID3 ...@@ -385,6 +392,7 @@ ID3DXBuffer *Program::compileToBinary(const char *hlsl, const char *profile, ID3
if (errorMessage) if (errorMessage)
{ {
const char *message = (const char*)errorMessage->GetBufferPointer(); const char *message = (const char*)errorMessage->GetBufferPointer();
TRACE("\n%s", hlsl); TRACE("\n%s", hlsl);
TRACE("\n%s", message); TRACE("\n%s", message);
} }
...@@ -404,6 +412,9 @@ void Program::link() ...@@ -404,6 +412,9 @@ void Program::link()
unlink(); unlink();
delete[] mInfoLog;
mInfoLog = NULL;
if (!mFragmentShader || !mFragmentShader->isCompiled()) if (!mFragmentShader || !mFragmentShader->isCompiled())
{ {
return; return;
...@@ -910,6 +921,32 @@ bool Program::applyUniform1iv(GLint location, GLsizei count, const GLint *v) ...@@ -910,6 +921,32 @@ bool Program::applyUniform1iv(GLint location, GLsizei count, const GLint *v)
return true; return true;
} }
void Program::appendToInfoLog(const char *info)
{
if (!info)
{
return;
}
size_t infoLength = strlen(info);
if (!mInfoLog)
{
mInfoLog = new char[infoLength + 1];
strcpy(mInfoLog, info);
}
else
{
size_t logLength = strlen(mInfoLog);
char *newLog = new char[logLength + infoLength + 1];
strcpy(newLog, mInfoLog);
strcpy(newLog + logLength, info);
delete[] mInfoLog;
mInfoLog = newLog;
}
}
// Returns the program object to an unlinked state, after detaching a shader, before re-linking, or at destruction // Returns the program object to an unlinked state, after detaching a shader, before re-linking, or at destruction
void Program::unlink(bool destroy) void Program::unlink(bool destroy)
{ {
...@@ -932,6 +969,9 @@ void Program::unlink(bool destroy) ...@@ -932,6 +969,9 @@ void Program::unlink(bool destroy)
delete[] mAttributeName[index]; delete[] mAttributeName[index];
mAttributeName[index] = NULL; mAttributeName[index] = NULL;
} }
delete[] mInfoLog;
mInfoLog = NULL;
} }
if (mPixelExecutable) if (mPixelExecutable)
...@@ -982,6 +1022,42 @@ bool Program::isLinked() ...@@ -982,6 +1022,42 @@ bool Program::isLinked()
return mLinked; return mLinked;
} }
int Program::getInfoLogLength() const
{
if (!mInfoLog)
{
return 0;
}
else
{
return strlen(mInfoLog) + 1;
}
}
void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{
int index = 0;
if (mInfoLog)
{
while (index < bufSize - 1 && index < (int)strlen(mInfoLog))
{
infoLog[index] = mInfoLog[index];
index++;
}
}
if (bufSize)
{
infoLog[index] = '\0';
}
if (length)
{
*length = index;
}
}
void Program::flagForDeletion() void Program::flagForDeletion()
{ {
mDeleteStatus = true; mDeleteStatus = true;
......
src/libGLESv2/Program.h
...@@ -55,6 +55,7 @@ class Program ...@@ -55,6 +55,7 @@ class Program
bool attachShader(Shader *shader); bool attachShader(Shader *shader);
bool detachShader(Shader *shader); bool detachShader(Shader *shader);
int getAttachedShadersCount() const;
IDirect3DPixelShader9 *getPixelShader(); IDirect3DPixelShader9 *getPixelShader();
IDirect3DVertexShader9 *getVertexShader(); IDirect3DVertexShader9 *getVertexShader();
...@@ -81,6 +82,8 @@ class Program ...@@ -81,6 +82,8 @@ class Program
void link(); void link();
bool isLinked(); bool isLinked();
int getInfoLogLength() const;
void getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog);
void flagForDeletion(); void flagForDeletion();
bool isFlaggedForDeletion() const; bool isFlaggedForDeletion() const;
...@@ -105,6 +108,8 @@ class Program ...@@ -105,6 +108,8 @@ class Program
bool applyUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value); bool applyUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value);
bool applyUniform1iv(GLint location, GLsizei count, const GLint *v); bool applyUniform1iv(GLint location, GLsizei count, const GLint *v);
void appendToInfoLog(const char *info);
FragmentShader *mFragmentShader; FragmentShader *mFragmentShader;
VertexShader *mVertexShader; VertexShader *mVertexShader;
...@@ -130,6 +135,7 @@ class Program ...@@ -130,6 +135,7 @@ class Program
bool mLinked; bool mLinked;
bool mDeleteStatus; // Flag to indicate that the program can be deleted when no longer in use bool mDeleteStatus; // Flag to indicate that the program can be deleted when no longer in use
char *mInfoLog;
}; };
} }
......
src/libGLESv2/Shader.cpp
...@@ -24,7 +24,7 @@ Shader::Shader() ...@@ -24,7 +24,7 @@ Shader::Shader()
{ {
mSource = NULL; mSource = NULL;
mHlsl = NULL; mHlsl = NULL;
mErrors = NULL; mInfoLog = NULL;
// Perform a one-time initialization of the shader compiler (or after being destructed by releaseCompiler) // Perform a one-time initialization of the shader compiler (or after being destructed by releaseCompiler)
if (!mFragmentCompiler) if (!mFragmentCompiler)
...@@ -46,7 +46,7 @@ Shader::~Shader() ...@@ -46,7 +46,7 @@ Shader::~Shader()
{ {
delete[] mSource; delete[] mSource;
delete[] mHlsl; delete[] mHlsl;
delete[] mErrors; delete[] mInfoLog;
} }
void Shader::setSource(GLsizei count, const char **string, const GLint *length) void Shader::setSource(GLsizei count, const char **string, const GLint *length)
...@@ -89,6 +89,78 @@ void Shader::setSource(GLsizei count, const char **string, const GLint *length) ...@@ -89,6 +89,78 @@ void Shader::setSource(GLsizei count, const char **string, const GLint *length)
mSource[totalLength] = '\0'; mSource[totalLength] = '\0';
} }
int Shader::getInfoLogLength() const
{
if (!mInfoLog)
{
return 0;
}
else
{
return strlen(mInfoLog) + 1;
}
}
void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{
int index = 0;
if (mInfoLog)
{
while (index < bufSize - 1 && index < (int)strlen(mInfoLog))
{
infoLog[index] = mInfoLog[index];
index++;
}
}
if (bufSize)
{
infoLog[index] = '\0';
}
if (length)
{
*length = index;
}
}
int Shader::getSourceLength() const
{
if (!mSource)
{
return 0;
}
else
{
return strlen(mSource) + 1;
}
}
void Shader::getSource(GLsizei bufSize, GLsizei *length, char *source)
{
int index = 0;
if (mSource)
{
while (index < bufSize - 1 && index < (int)strlen(mInfoLog))
{
source[index] = mSource[index];
index++;
}
}
if (bufSize)
{
source[index] = '\0';
}
if (length)
{
*length = index;
}
}
bool Shader::isCompiled() bool Shader::isCompiled()
{ {
return mHlsl != NULL; return mHlsl != NULL;
...@@ -119,6 +191,11 @@ bool Shader::isDeletable() const ...@@ -119,6 +191,11 @@ bool Shader::isDeletable() const
return mDeleteStatus == true && mAttachCount == 0; return mDeleteStatus == true && mAttachCount == 0;
} }
bool Shader::isFlaggedForDeletion() const
{
return mDeleteStatus;
}
void Shader::flagForDeletion() void Shader::flagForDeletion()
{ {
mDeleteStatus = true; mDeleteStatus = true;
...@@ -142,8 +219,8 @@ void Shader::compileToHLSL(void *compiler) ...@@ -142,8 +219,8 @@ void Shader::compileToHLSL(void *compiler)
TRACE("\n%s", mSource); TRACE("\n%s", mSource);
delete[] mErrors; delete[] mInfoLog;
mErrors = NULL; mInfoLog = NULL;
TBuiltInResource resources; TBuiltInResource resources;
...@@ -169,10 +246,10 @@ void Shader::compileToHLSL(void *compiler) ...@@ -169,10 +246,10 @@ void Shader::compileToHLSL(void *compiler)
} }
else else
{ {
mErrors = new char[strlen(info) + 1]; mInfoLog = new char[strlen(info) + 1];
strcpy(mErrors, info); strcpy(mInfoLog, info);
TRACE("\n%s", mErrors); TRACE("\n%s", mInfoLog);
} }
} }
......
src/libGLESv2/Shader.h
...@@ -31,6 +31,10 @@ class Shader ...@@ -31,6 +31,10 @@ class Shader
void deleteSource(); void deleteSource();
void setSource(GLsizei count, const char **string, const GLint *length); void setSource(GLsizei count, const char **string, const GLint *length);
int getInfoLogLength() const;
void getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog);
int getSourceLength() const;
void getSource(GLsizei bufSize, GLsizei *length, char *source);
virtual void compile() = 0; virtual void compile() = 0;
bool isCompiled(); bool isCompiled();
...@@ -40,6 +44,7 @@ class Shader ...@@ -40,6 +44,7 @@ class Shader
void detach(); void detach();
bool isAttached() const; bool isAttached() const;
bool isDeletable() const; bool isDeletable() const;
bool isFlaggedForDeletion() const;
void flagForDeletion(); void flagForDeletion();
static void releaseCompiler(); static void releaseCompiler();
...@@ -54,7 +59,7 @@ class Shader ...@@ -54,7 +59,7 @@ class Shader
char *mSource; char *mSource;
char *mHlsl; char *mHlsl;
char *mErrors; char *mInfoLog;
static void *mFragmentCompiler; static void *mFragmentCompiler;
static void *mVertexCompiler; static void *mVertexCompiler;
......
src/libGLESv2/libGLESv2.cpp
...@@ -1928,8 +1928,7 @@ void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params) ...@@ -1928,8 +1928,7 @@ void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params)
switch (pname) switch (pname)
{ {
case GL_DELETE_STATUS: case GL_DELETE_STATUS:
UNIMPLEMENTED(); // FIXME *params = programObject->isFlaggedForDeletion();
*params = GL_FALSE;
return; return;
case GL_LINK_STATUS: case GL_LINK_STATUS:
*params = programObject->isLinked(); *params = programObject->isLinked();
...@@ -1939,12 +1938,10 @@ void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params) ...@@ -1939,12 +1938,10 @@ void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params)
*params = GL_TRUE; *params = GL_TRUE;
return; return;
case GL_INFO_LOG_LENGTH: case GL_INFO_LOG_LENGTH:
UNIMPLEMENTED(); // FIXME *params = programObject->getInfoLogLength();
*params = 0;
return; return;
case GL_ATTACHED_SHADERS: case GL_ATTACHED_SHADERS:
UNIMPLEMENTED(); // FIXME *params = programObject->getAttachedShadersCount();
*params = 2;
return; return;
case GL_ACTIVE_ATTRIBUTES: case GL_ACTIVE_ATTRIBUTES:
UNIMPLEMENTED(); // FIXME UNIMPLEMENTED(); // FIXME
...@@ -1985,7 +1982,19 @@ void __stdcall glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* len ...@@ -1985,7 +1982,19 @@ void __stdcall glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* len
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
} }
UNIMPLEMENTED(); // FIXME gl::Context *context = gl::getContext();
if (context)
{
gl::Program *programObject = context->getProgram(program);
if (!programObject)
{
return error(GL_INVALID_VALUE);
}
programObject->getInfoLog(bufsize, length, infolog);
}
} }
catch(std::bad_alloc&) catch(std::bad_alloc&)
{ {
...@@ -2030,19 +2039,16 @@ void __stdcall glGetShaderiv(GLuint shader, GLenum pname, GLint* params) ...@@ -2030,19 +2039,16 @@ void __stdcall glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
*params = shaderObject->getType(); *params = shaderObject->getType();
return; return;
case GL_DELETE_STATUS: case GL_DELETE_STATUS:
UNIMPLEMENTED(); // FIXME *params = shaderObject->isFlaggedForDeletion();
*params = GL_FALSE;
return; return;
case GL_COMPILE_STATUS: case GL_COMPILE_STATUS:
*params = shaderObject->isCompiled() ? GL_TRUE : GL_FALSE; *params = shaderObject->isCompiled() ? GL_TRUE : GL_FALSE;
return; return;
case GL_INFO_LOG_LENGTH: case GL_INFO_LOG_LENGTH:
UNIMPLEMENTED(); // FIXME *params = shaderObject->getInfoLogLength();
*params = 0;
return; return;
case GL_SHADER_SOURCE_LENGTH: case GL_SHADER_SOURCE_LENGTH:
UNIMPLEMENTED(); // FIXME *params = shaderObject->getSourceLength();
*params = 1;
return; return;
default: default:
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
...@@ -2067,7 +2073,19 @@ void __stdcall glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* lengt ...@@ -2067,7 +2073,19 @@ void __stdcall glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* lengt
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
} }
UNIMPLEMENTED(); // FIXME gl::Context *context = gl::getContext();
if (context)
{
gl::Shader *shaderObject = context->getShader(shader);
if (!shaderObject)
{
return error(GL_INVALID_VALUE);
}
shaderObject->getInfoLog(bufsize, length, infolog);
}
} }
catch(std::bad_alloc&) catch(std::bad_alloc&)
{ {
...@@ -2102,7 +2120,19 @@ void __stdcall glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length ...@@ -2102,7 +2120,19 @@ void __stdcall glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
} }
UNIMPLEMENTED(); // FIXME gl::Context *context = gl::getContext();
if (context)
{
gl::Shader *shaderObject = context->getShader(shader);
if (!shaderObject)
{
return error(GL_INVALID_VALUE);
}
shaderObject->getSource(bufsize, length, source);
}
} }
catch(std::bad_alloc&) catch(std::bad_alloc&)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment