fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add shader_source() helper

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-07-20 11:24:10 +02:00
parent bece5a7ddd
commit 29f84556ca
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/main/shaderapi.c
View file

@ -1814,23 +1814,26 @@ read_shader(const gl_shader_stage stage, const char *source)
* Basically, concatenate the source code strings into one long string
* and pass it to _mesa_shader_source().
*/
void GLAPIENTRY
_mesa_ShaderSource(GLuint shaderObj, GLsizei count,
const GLchar * const * string, const GLint * length)
static ALWAYS_INLINE void
shader_source(struct gl_context *ctx, GLuint shaderObj, GLsizei count,
const GLchar *const *string, const GLint *length, bool no_error)
{
GET_CURRENT_CONTEXT(ctx);
GLint *offsets;
GLsizei i, totalLength;
GLcharARB *source;
struct gl_shader *sh;
sh = _mesa_lookup_shader_err(ctx, shaderObj, "glShaderSourceARB");
if (!sh)
return;
if (!no_error) {
sh = _mesa_lookup_shader_err(ctx, shaderObj, "glShaderSourceARB");
if (!sh)
return;
if (string == NULL) {
_mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
return;
if (string == NULL) {
_mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
return;
}
} else {
sh = _mesa_lookup_shader(ctx, shaderObj);
}
/*
@ -1844,7 +1847,7 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
}
for (i = 0; i < count; i++) {
if (string[i] == NULL) {
if (!no_error && string[i] == NULL) {
free((GLvoid *) offsets);
_mesa_error(ctx, GL_INVALID_OPERATION,
"glShaderSourceARB(null string)");
@ -1900,6 +1903,15 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
}
void GLAPIENTRY
_mesa_ShaderSource(GLuint shaderObj, GLsizei count,
const GLchar *const *string, const GLint *length)
{
GET_CURRENT_CONTEXT(ctx);
shader_source(ctx, shaderObj, count, string, length, false);
}
static ALWAYS_INLINE void
use_program(GLuint program, bool no_error)
{