2008-06-02 06:58:57 -04:00
|
|
|
/*
|
2009-04-27 10:48:12 -04:00
|
|
|
* Cogl
|
2008-06-02 06:58:57 -04:00
|
|
|
*
|
2009-04-27 10:48:12 -04:00
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
2008-06-02 06:58:57 -04:00
|
|
|
*
|
2010-08-02 16:40:55 -04:00
|
|
|
* Copyright (C) 2007,2008,2009,2010 Intel Corporation.
|
2008-06-02 06:58:57 -04:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
2010-03-01 07:56:10 -05:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*
|
2008-06-02 06:58:57 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "cogl.h"
|
2008-10-30 13:25:00 -04:00
|
|
|
#include "cogl-shader-private.h"
|
2010-07-23 12:46:41 -04:00
|
|
|
#include "cogl-shader-boilerplate.h"
|
2008-06-02 06:58:57 -04:00
|
|
|
#include "cogl-internal.h"
|
|
|
|
#include "cogl-context.h"
|
|
|
|
#include "cogl-handle.h"
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
#include <glib.h>
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
#include <string.h>
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
#ifdef HAVE_COGL_GL
|
2010-10-15 13:00:29 -04:00
|
|
|
#define glCreateShader ctx->drv.pf_glCreateShader
|
|
|
|
#define glGetShaderiv ctx->drv.pf_glGetShaderiv
|
|
|
|
#define glGetShaderInfoLog ctx->drv.pf_glGetShaderInfoLog
|
|
|
|
#define glCompileShader ctx->drv.pf_glCompileShader
|
|
|
|
#define glShaderSource ctx->drv.pf_glShaderSource
|
|
|
|
#define glDeleteShader ctx->drv.pf_glDeleteShader
|
|
|
|
#define glProgramString ctx->drv.pf_glProgramString
|
|
|
|
#define glBindProgram ctx->drv.pf_glBindProgram
|
|
|
|
#define glDeletePrograms ctx->drv.pf_glDeletePrograms
|
|
|
|
#define glGenPrograms ctx->drv.pf_glGenPrograms
|
2010-08-02 16:40:55 -04:00
|
|
|
#define GET_CONTEXT _COGL_GET_CONTEXT
|
|
|
|
#else
|
|
|
|
#define GET_CONTEXT(CTXVAR,RETVAL) G_STMT_START { } G_STMT_END
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef HAVE_COGL_GLES
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
static void _cogl_shader_free (CoglShader *shader);
|
|
|
|
|
2009-04-01 12:16:44 -04:00
|
|
|
COGL_HANDLE_DEFINE (Shader, shader);
|
2010-07-09 12:59:16 -04:00
|
|
|
COGL_OBJECT_DEFINE_DEPRECATED_REF_COUNTING (shader);
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_shader_free (CoglShader *shader)
|
|
|
|
{
|
|
|
|
/* Frees shader resources but its handle is not
|
|
|
|
released! Do that separately before this! */
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2010-08-04 12:53:51 -04:00
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GL
|
|
|
|
if (shader->language == COGL_SHADER_LANGUAGE_ARBFP)
|
2010-10-15 13:00:29 -04:00
|
|
|
{
|
|
|
|
if (shader->gl_handle)
|
|
|
|
GE (glDeletePrograms (1, &shader->gl_handle));
|
|
|
|
}
|
2010-08-04 12:53:51 -04:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if (shader->gl_handle)
|
|
|
|
GE (glDeleteShader (shader->gl_handle));
|
2010-07-22 11:58:23 -04:00
|
|
|
|
|
|
|
g_slice_free (CoglShader, shader);
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
CoglHandle
|
2009-05-12 09:15:18 -04:00
|
|
|
cogl_create_shader (CoglShaderType type)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
CoglShader *shader;
|
2009-05-12 09:15:18 -04:00
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
GET_CONTEXT (ctx, COGL_INVALID_HANDLE);
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
switch (type)
|
2009-05-12 09:15:18 -04:00
|
|
|
{
|
2010-08-04 12:53:51 -04:00
|
|
|
case COGL_SHADER_TYPE_VERTEX:
|
|
|
|
case COGL_SHADER_TYPE_FRAGMENT:
|
|
|
|
break;
|
|
|
|
default:
|
2009-05-12 09:15:18 -04:00
|
|
|
g_warning ("Unexpected shader type (0x%08lX) given to "
|
|
|
|
"cogl_create_shader", (unsigned long) type);
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
shader = g_slice_new (CoglShader);
|
2010-08-04 12:53:51 -04:00
|
|
|
shader->language = COGL_SHADER_LANGUAGE_GLSL;
|
|
|
|
shader->gl_handle = 0;
|
2010-07-23 12:46:41 -04:00
|
|
|
#ifdef HAVE_COGL_GLES2
|
|
|
|
shader->n_tex_coord_attribs = 0;
|
|
|
|
#endif
|
2010-07-14 14:39:24 -04:00
|
|
|
shader->type = type;
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
return _cogl_shader_handle_new (shader);
|
|
|
|
}
|
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
static void
|
|
|
|
delete_shader (CoglShader *shader)
|
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GL
|
|
|
|
if (shader->language == COGL_SHADER_LANGUAGE_ARBFP)
|
|
|
|
{
|
|
|
|
if (shader->gl_handle)
|
|
|
|
GE (glDeletePrograms (1, &shader->gl_handle));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (shader->gl_handle)
|
|
|
|
GE (glDeleteShader (shader->gl_handle));
|
|
|
|
}
|
|
|
|
|
|
|
|
shader->gl_handle = 0;
|
|
|
|
}
|
|
|
|
|
2008-06-02 06:58:57 -04:00
|
|
|
void
|
|
|
|
cogl_shader_source (CoglHandle handle,
|
2009-05-12 09:15:18 -04:00
|
|
|
const char *source)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
CoglShader *shader;
|
2010-08-04 12:53:51 -04:00
|
|
|
CoglShaderLanguage language;
|
|
|
|
|
2008-06-02 06:58:57 -04:00
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-06-02 06:58:57 -04:00
|
|
|
if (!cogl_is_shader (handle))
|
|
|
|
return;
|
|
|
|
|
|
|
|
shader = _cogl_shader_pointer_from_handle (handle);
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
#ifdef HAVE_COGL_GL
|
|
|
|
if (strncmp (source, "!!ARBfp1.0", 10) == 0)
|
|
|
|
language = COGL_SHADER_LANGUAGE_ARBFP;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
language = COGL_SHADER_LANGUAGE_GLSL;
|
|
|
|
|
|
|
|
/* Delete the old object if the language is changing... */
|
2010-07-23 12:46:41 -04:00
|
|
|
if (G_UNLIKELY (language != shader->language) &&
|
|
|
|
shader->gl_handle)
|
|
|
|
delete_shader (shader);
|
|
|
|
|
|
|
|
shader->source = g_strdup (source);
|
|
|
|
|
|
|
|
shader->language = language;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_shader_compile (CoglHandle handle)
|
|
|
|
{
|
|
|
|
CoglShader *shader = handle;
|
|
|
|
|
|
|
|
if (!cogl_is_shader (handle))
|
|
|
|
return;
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
#ifdef HAVE_COGL_GL
|
2010-07-23 12:46:41 -04:00
|
|
|
_cogl_shader_compile_real (shader, 0 /* ignored */);
|
2010-08-12 05:40:39 -04:00
|
|
|
#endif
|
2010-07-23 12:46:41 -04:00
|
|
|
|
|
|
|
/* XXX: For GLES2 we don't actually compile anything until the
|
|
|
|
* shader gets used so we have an opportunity to add some
|
|
|
|
* boilerplate to the shader.
|
|
|
|
*
|
|
|
|
* At the end of the day this is obviously a badly designed API
|
|
|
|
* given that we are having to lie to the user. It was a mistake to
|
|
|
|
* so thinly wrap the OpenGL shader API and the current plan is to
|
|
|
|
* replace it with a pipeline snippets API. */
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_cogl_shader_compile_real (CoglHandle handle,
|
|
|
|
int n_tex_coord_attribs)
|
|
|
|
{
|
|
|
|
CoglShader *shader = handle;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2010-08-04 12:53:51 -04:00
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GL
|
2010-07-23 12:46:41 -04:00
|
|
|
if (shader->language == COGL_SHADER_LANGUAGE_ARBFP)
|
2010-10-15 13:00:29 -04:00
|
|
|
{
|
|
|
|
#ifdef COGL_GL_DEBUG
|
|
|
|
GLenum gl_error;
|
|
|
|
#endif
|
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
if (shader->gl_handle)
|
|
|
|
return;
|
|
|
|
|
2010-10-15 13:00:29 -04:00
|
|
|
GE (glGenPrograms (1, &shader->gl_handle));
|
|
|
|
|
|
|
|
GE (glBindProgram (GL_FRAGMENT_PROGRAM_ARB, shader->gl_handle));
|
|
|
|
|
|
|
|
#ifdef COGL_GL_DEBUG
|
|
|
|
while ((gl_error = glGetError ()) != GL_NO_ERROR)
|
|
|
|
;
|
|
|
|
#endif
|
|
|
|
glProgramString (GL_FRAGMENT_PROGRAM_ARB,
|
|
|
|
GL_PROGRAM_FORMAT_ASCII_ARB,
|
2010-07-23 12:46:41 -04:00
|
|
|
strlen (shader->source),
|
|
|
|
shader->source);
|
2010-10-15 13:00:29 -04:00
|
|
|
#ifdef COGL_GL_DEBUG
|
|
|
|
gl_error = glGetError ();
|
|
|
|
if (gl_error != GL_NO_ERROR)
|
|
|
|
{
|
|
|
|
g_warning ("%s: GL error (%d): Failed to compile ARBfp:\n%s\n%s",
|
|
|
|
G_STRLOC,
|
|
|
|
gl_error,
|
2010-07-23 12:46:41 -04:00
|
|
|
shader->source,
|
2010-10-15 13:00:29 -04:00
|
|
|
glGetString (GL_PROGRAM_ERROR_STRING_ARB));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2010-08-04 12:53:51 -04:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
2010-07-23 12:46:41 -04:00
|
|
|
char *sourcev[4];
|
|
|
|
int count = 0;
|
|
|
|
GLenum gl_type;
|
|
|
|
|
|
|
|
if (shader->gl_handle
|
|
|
|
#ifdef HAVE_COGL_GLES2
|
|
|
|
&& shader->n_tex_coord_attribs >= n_tex_coord_attribs
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (shader->gl_handle)
|
|
|
|
delete_shader (shader);
|
|
|
|
|
|
|
|
switch (shader->type)
|
2010-08-04 12:53:51 -04:00
|
|
|
{
|
2010-07-23 12:46:41 -04:00
|
|
|
case COGL_SHADER_TYPE_VERTEX:
|
|
|
|
gl_type = GL_VERTEX_SHADER;
|
|
|
|
break;
|
|
|
|
case COGL_SHADER_TYPE_FRAGMENT:
|
|
|
|
gl_type = GL_FRAGMENT_SHADER;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
2010-08-04 12:53:51 -04:00
|
|
|
}
|
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
shader->gl_handle = glCreateShader (gl_type);
|
2008-06-02 06:58:57 -04:00
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
sourcev[count++] = _COGL_COMMON_SHADER_BOILERPLATE;
|
|
|
|
if (shader->type == COGL_SHADER_TYPE_VERTEX)
|
|
|
|
sourcev[count++] = _COGL_VERTEX_SHADER_BOILERPLATE;
|
|
|
|
else
|
|
|
|
sourcev[count++] = _COGL_FRAGMENT_SHADER_BOILERPLATE;
|
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GLES2
|
|
|
|
if (n_tex_coord_attribs)
|
|
|
|
sourcev[count++] =
|
|
|
|
g_strdup_printf ("varying vec2 _cogl_tex_coord[%d];\n",
|
|
|
|
n_tex_coord_attribs);
|
|
|
|
shader->n_tex_coord_attribs = n_tex_coord_attribs;
|
|
|
|
#endif
|
2008-06-02 06:58:57 -04:00
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
sourcev[count++] = shader->source;
|
2008-06-02 06:58:57 -04:00
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
glShaderSource (shader->gl_handle, count, (const char **)sourcev, NULL);
|
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GLES2
|
|
|
|
if (count == 4)
|
|
|
|
g_free (sourcev[2]);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
GE (glCompileShader (shader->gl_handle));
|
2008-06-02 06:58:57 -04:00
|
|
|
|
2010-07-23 12:46:41 -04:00
|
|
|
#ifdef COGL_GL_DEBUG
|
|
|
|
if (!cogl_shader_is_compiled (handle))
|
|
|
|
{
|
|
|
|
char *log = cogl_shader_get_info_log (handle);
|
|
|
|
g_warning ("Failed to compile GLSL program:\nsrc:\n%s\nerror:\n%s\n",
|
|
|
|
shader->source,
|
|
|
|
log);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
char *
|
2009-06-01 11:31:32 -04:00
|
|
|
cogl_shader_get_info_log (CoglHandle handle)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
CoglShader *shader;
|
2010-08-02 16:40:55 -04:00
|
|
|
|
|
|
|
GET_CONTEXT (ctx, NULL);
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
if (!cogl_is_shader (handle))
|
2009-06-01 11:31:32 -04:00
|
|
|
return NULL;
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
shader = _cogl_shader_pointer_from_handle (handle);
|
|
|
|
|
2010-08-12 05:43:22 -04:00
|
|
|
#ifdef HAVE_COGL_GL
|
2010-08-04 12:53:51 -04:00
|
|
|
if (shader->language == COGL_SHADER_LANGUAGE_ARBFP)
|
|
|
|
{
|
|
|
|
/* ARBfp exposes a program error string, but since cogl_program
|
|
|
|
* doesn't have any API to query an error log it is not currently
|
|
|
|
* exposed. */
|
2010-08-12 05:43:22 -04:00
|
|
|
return g_strdup ("");
|
2010-08-04 12:53:51 -04:00
|
|
|
}
|
|
|
|
else
|
2010-08-12 05:43:22 -04:00
|
|
|
#endif
|
2010-08-04 12:53:51 -04:00
|
|
|
{
|
|
|
|
char buffer[512];
|
|
|
|
int len = 0;
|
2010-07-23 12:46:41 -04:00
|
|
|
|
|
|
|
/* We don't normally compile the shader when the user calls
|
|
|
|
* cogl_shader_compile() because we want to be able to add
|
|
|
|
* boilerplate code that depends on how it ends up finally being
|
|
|
|
* used.
|
|
|
|
*
|
|
|
|
* Here we force an early compile if the user is interested in
|
|
|
|
* log information to increase the chance that the log will be
|
|
|
|
* useful! We have to guess the number of texture coordinate
|
|
|
|
* attributes that may be used (normally less than 4) since that
|
|
|
|
* affects the boilerplate.
|
|
|
|
*/
|
|
|
|
if (!shader->gl_handle)
|
|
|
|
_cogl_shader_compile_real (handle, 4);
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
glGetShaderInfoLog (shader->gl_handle, 511, &len, buffer);
|
|
|
|
buffer[len] = '\0';
|
|
|
|
return g_strdup (buffer);
|
|
|
|
}
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
2009-05-12 09:15:18 -04:00
|
|
|
CoglShaderType
|
|
|
|
cogl_shader_get_type (CoglHandle handle)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
CoglShader *shader;
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
GET_CONTEXT (ctx, COGL_SHADER_TYPE_VERTEX);
|
|
|
|
|
2008-06-02 06:58:57 -04:00
|
|
|
if (!cogl_is_shader (handle))
|
2009-05-12 09:15:18 -04:00
|
|
|
{
|
|
|
|
g_warning ("Non shader handle type passed to cogl_shader_get_type");
|
|
|
|
return COGL_SHADER_TYPE_VERTEX;
|
|
|
|
}
|
|
|
|
|
|
|
|
shader = _cogl_shader_pointer_from_handle (handle);
|
2010-07-23 12:44:53 -04:00
|
|
|
return shader->type;
|
2009-05-12 09:15:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cogl_shader_is_compiled (CoglHandle handle)
|
|
|
|
{
|
|
|
|
GLint status;
|
|
|
|
CoglShader *shader;
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
GET_CONTEXT (ctx, FALSE);
|
|
|
|
|
2009-05-12 09:15:18 -04:00
|
|
|
if (!cogl_is_shader (handle))
|
|
|
|
return FALSE;
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
shader = _cogl_shader_pointer_from_handle (handle);
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
#ifdef HAVE_COGL_GL
|
|
|
|
if (shader->language == COGL_SHADER_LANGUAGE_ARBFP)
|
2009-05-12 09:15:18 -04:00
|
|
|
return TRUE;
|
|
|
|
else
|
2010-08-04 12:53:51 -04:00
|
|
|
#endif
|
|
|
|
{
|
2010-07-23 12:46:41 -04:00
|
|
|
/* FIXME: We currently have an arbitrary limit of 4 texture
|
|
|
|
* coordinate attributes since our API means we have to add
|
|
|
|
* some boilerplate to the users GLSL program (for GLES2)
|
|
|
|
* before we actually know how many attributes are in use.
|
|
|
|
*
|
|
|
|
* 4 will probably be enough (or at least that limitation should
|
|
|
|
* be enough until we can replace this API with the pipeline
|
|
|
|
* snippets API) but if it isn't then the shader won't compile,
|
|
|
|
* through no fault of the user.
|
|
|
|
*
|
|
|
|
* To some extent this is just a symptom of bad API design; it
|
|
|
|
* was a mistake for Cogl to so thinly wrap the OpenGL shader
|
|
|
|
* API. Eventually we plan for this whole API will be deprecated
|
|
|
|
* by the pipeline snippets framework.
|
|
|
|
*/
|
|
|
|
if (!shader->gl_handle)
|
|
|
|
_cogl_shader_compile_real (handle, 4);
|
|
|
|
|
2010-08-04 12:53:51 -04:00
|
|
|
GE (glGetShaderiv (shader->gl_handle, GL_COMPILE_STATUS, &status));
|
|
|
|
if (status == GL_TRUE)
|
|
|
|
return TRUE;
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
#else /* HAVE_COGL_GLES */
|
2008-06-02 06:58:57 -04:00
|
|
|
|
|
|
|
/* No support on regular OpenGL 1.1 */
|
|
|
|
|
|
|
|
CoglHandle
|
2009-05-12 09:15:18 -04:00
|
|
|
cogl_create_shader (CoglShaderType type)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cogl_is_shader (CoglHandle handle)
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
CoglHandle
|
|
|
|
cogl_shader_ref (CoglHandle handle)
|
|
|
|
{
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_shader_unref (CoglHandle handle)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_shader_source (CoglHandle shader,
|
2009-05-12 09:15:18 -04:00
|
|
|
const char *source)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_shader_compile (CoglHandle shader_handle)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
char *
|
2009-06-04 07:04:47 -04:00
|
|
|
cogl_shader_get_info_log (CoglHandle handle)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
2009-06-04 07:04:47 -04:00
|
|
|
return NULL;
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
2009-05-12 09:15:18 -04:00
|
|
|
CoglShaderType
|
|
|
|
cogl_shader_get_type (CoglHandle handle)
|
2008-06-02 06:58:57 -04:00
|
|
|
{
|
2009-05-12 09:15:18 -04:00
|
|
|
return COGL_SHADER_TYPE_VERTEX;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cogl_shader_is_compiled (CoglHandle handle)
|
|
|
|
{
|
|
|
|
return FALSE;
|
2008-06-02 06:58:57 -04:00
|
|
|
}
|
|
|
|
|
2010-08-02 16:40:55 -04:00
|
|
|
#endif /* HAVE_COGL_GLES */
|
|
|
|
|