mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
a131b697d9
Previously the sampler uniform declarations such as cogl_sampler0 were generated by walking the list of layers in the shader state. This had two problems. Firstly it would only generate the declarations for layers that have been referenced. If a layer has a combine mode of replace then the samplers from previous layers couldn't be used by custom snippets. Secondly it meant that the samplers couldn't be referenced by functions in the declarations sections because the samplers are declared too late. This patch fixes it to generate the layer declarations in the backend start function using all of the layers on the pipeline instead. In addition it adds the sampler declarations to the vertex shader as they were previously missing. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 1824df902bbb9995cae6ffb7a413913f2df35eef) Conflicts: cogl/driver/gl/cogl-pipeline-fragend-glsl.c cogl/driver/gl/cogl-pipeline-vertend-glsl.c
76 lines
2.6 KiB
C
76 lines
2.6 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2012, 2013 Intel Corporation.
|
|
*
|
|
* 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
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifndef _COGL_UTIL_GL_PRIVATE_H_
|
|
|
|
#include "cogl-types.h"
|
|
#include "cogl-context.h"
|
|
#include "cogl-gl-header.h"
|
|
#include "cogl-texture.h"
|
|
|
|
#ifdef COGL_GL_DEBUG
|
|
|
|
const char *
|
|
_cogl_gl_error_to_string (GLenum error_code);
|
|
|
|
#define GE(ctx, x) G_STMT_START { \
|
|
GLenum __err; \
|
|
(ctx)->x; \
|
|
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
|
|
{ \
|
|
g_warning ("%s: GL error (%d): %s\n", \
|
|
G_STRLOC, \
|
|
__err, \
|
|
_cogl_gl_error_to_string (__err)); \
|
|
} } G_STMT_END
|
|
|
|
#define GE_RET(ret, ctx, x) G_STMT_START { \
|
|
GLenum __err; \
|
|
ret = (ctx)->x; \
|
|
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
|
|
{ \
|
|
g_warning ("%s: GL error (%d): %s\n", \
|
|
G_STRLOC, \
|
|
__err, \
|
|
_cogl_gl_error_to_string (__err)); \
|
|
} } G_STMT_END
|
|
|
|
#else /* !COGL_GL_DEBUG */
|
|
|
|
#define GE(ctx, x) ((ctx)->x)
|
|
#define GE_RET(ret, ctx, x) (ret = ((ctx)->x))
|
|
|
|
#endif /* COGL_GL_DEBUG */
|
|
|
|
CoglBool
|
|
_cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error);
|
|
|
|
void
|
|
_cogl_gl_util_get_texture_target_string (CoglTextureType texture_type,
|
|
const char **target_string_out,
|
|
const char **swizzle_out);
|
|
|
|
#endif /* _COGL_UTIL_GL_PRIVATE_H_ */
|