diff options
| author | Robert Bragg <robert@linux.intel.com> | 2010-04-26 10:01:43 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2010-06-09 17:15:59 +0100 |
| commit | acc44161c108dafef63d730b585b4f68b935f6ad (patch) | |
| tree | 23171e3b4972c746255c6dfdd0a6cca3def7c52b /cogl/cogl-buffer.c | |
| parent | 8ebf76a9a91da0bbbe1208366c1740f0c77d6392 (diff) | |
| download | cogl-acc44161c108dafef63d730b585b4f68b935f6ad.tar.gz | |
material: Adds backend abstraction for fragment processing
As part of an effort to improve the architecture of CoglMaterial
internally this overhauls how we flush layer state to OpenGL by adding a
formal backend abstraction for fragment processing and further
formalizing the CoglTextureUnit abstraction.
There are three backends: "glsl", "arbfp" and "fixed". The fixed backend
uses the OpenGL fixed function APIs to setup the fragment processing,
the arbfp backend uses code generation to handle fragment processing
using an ARBfp program, and the GLSL backend is currently only there as
a formality to handle user programs associated with a material. (i.e.
the glsl backend doesn't yet support code generation)
The GLSL backend has highest precedence, then arbfp and finally the
fixed. If a backend can't support some particular CoglMaterial feature
then it will fallback to the next backend.
This adds three new COGL_DEBUG options:
* "disable-texturing" as expected should disable all texturing
* "disable-arbfp" always make the arbfp backend fallback
* "disable-glsl" always make the glsl backend fallback
* "show-source" show code generated by the arbfp/glsl backends
Diffstat (limited to 'cogl/cogl-buffer.c')
| -rw-r--r-- | cogl/cogl-buffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c index c54d52c3..a3ede8f4 100644 --- a/cogl/cogl-buffer.c +++ b/cogl/cogl-buffer.c @@ -58,8 +58,6 @@ #define glDeleteBuffers ctx->drv.pf_glDeleteBuffers #define glMapBuffer ctx->drv.pf_glMapBuffer #define glUnmapBuffer ctx->drv.pf_glUnmapBuffer -#define glActiveTexture ctx->drv.pf_glActiveTexture -#define glClientActiveTexture ctx->drv.pf_glClientActiveTexture #ifndef GL_ARRAY_BUFFER #define GL_ARRAY_BUFFER GL_ARRAY_BUFFER_ARB #endif |