diff options
| author | Neil Roberts <neil@linux.intel.com> | 2011-11-03 16:42:06 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2011-11-16 16:32:11 +0000 |
| commit | 7068849ae627367fa0ec81894d446b642b9e9bd6 (patch) | |
| tree | e015e99ea7091d38a38d2a588bde3429673a3533 | |
| parent | 256f5791fde5e050fd1b192cc3c1c89174b69025 (diff) | |
| download | cogl-7068849ae627367fa0ec81894d446b642b9e9bd6.tar.gz | |
cogl-boxed-value: Wrap the GL calls in the GE() macro
This wraps all of the calls to glUniform* in the GE() macro so that it
will detect GL errors in the right place.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | cogl/cogl-boxed-value.c | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/cogl/cogl-boxed-value.c b/cogl/cogl-boxed-value.c index ec1d4d5f..47f375a3 100644 --- a/cogl/cogl-boxed-value.c +++ b/cogl/cogl-boxed-value.c @@ -229,10 +229,18 @@ _cogl_boxed_value_set_uniform (CoglContext *ctx, switch (value->size) { - case 1: ctx->glUniform1iv (location, value->count, ptr); break; - case 2: ctx->glUniform2iv (location, value->count, ptr); break; - case 3: ctx->glUniform3iv (location, value->count, ptr); break; - case 4: ctx->glUniform4iv (location, value->count, ptr); break; + case 1: + GE( ctx, glUniform1iv (location, value->count, ptr) ); + break; + case 2: + GE( ctx, glUniform2iv (location, value->count, ptr) ); + break; + case 3: + GE( ctx, glUniform3iv (location, value->count, ptr) ); + break; + case 4: + GE( ctx, glUniform4iv (location, value->count, ptr) ); + break; } } break; @@ -248,10 +256,18 @@ _cogl_boxed_value_set_uniform (CoglContext *ctx, switch (value->size) { - case 1: ctx->glUniform1fv (location, value->count, ptr); break; - case 2: ctx->glUniform2fv (location, value->count, ptr); break; - case 3: ctx->glUniform3fv (location, value->count, ptr); break; - case 4: ctx->glUniform4fv (location, value->count, ptr); break; + case 1: + GE( ctx, glUniform1fv (location, value->count, ptr) ); + break; + case 2: + GE( ctx, glUniform2fv (location, value->count, ptr) ); + break; + case 3: + GE( ctx, glUniform3fv (location, value->count, ptr) ); + break; + case 4: + GE( ctx, glUniform4fv (location, value->count, ptr) ); + break; } } break; @@ -268,16 +284,16 @@ _cogl_boxed_value_set_uniform (CoglContext *ctx, switch (value->size) { case 2: - ctx->glUniformMatrix2fv (location, value->count, - value->transpose, ptr); + GE( ctx, glUniformMatrix2fv (location, value->count, + value->transpose, ptr) ); break; case 3: - ctx->glUniformMatrix3fv (location, value->count, - value->transpose, ptr); + GE( ctx, glUniformMatrix3fv (location, value->count, + value->transpose, ptr) ); break; case 4: - ctx->glUniformMatrix4fv (location, value->count, - value->transpose, ptr); + GE( ctx, glUniformMatrix4fv (location, value->count, + value->transpose, ptr) ); break; } } |