mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
aafcee31b2
There were some completely unused static global variables declared in cogl-pixel-array.c which this patch removes.
155 lines
4.2 KiB
C
155 lines
4.2 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010 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:
|
|
* Damien Lespiau <damien.lespiau@intel.com>
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
/* For an overview of the functionality implemented here, please see
|
|
* cogl-pixel-array.h, which contains the gtk-doc section overview for the
|
|
* Pixel Buffers API.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
|
|
#include "cogl.h"
|
|
#include "cogl-internal.h"
|
|
#include "cogl-util.h"
|
|
#include "cogl-context.h"
|
|
#include "cogl-object.h"
|
|
#include "cogl-pixel-array-private.h"
|
|
#include "cogl-pixel-array.h"
|
|
|
|
/*
|
|
* GL/GLES compatibility defines for the buffer API:
|
|
*/
|
|
|
|
#if defined (HAVE_COGL_GL)
|
|
|
|
#define glGenBuffers ctx->drv.pf_glGenBuffers
|
|
#define glBindBuffer ctx->drv.pf_glBindBuffer
|
|
#define glBufferData ctx->drv.pf_glBufferData
|
|
#define glBufferSubData ctx->drv.pf_glBufferSubData
|
|
#define glGetBufferSubData ctx->drv.pf_glGetBufferSubData
|
|
#define glDeleteBuffers ctx->drv.pf_glDeleteBuffers
|
|
#define glMapBuffer ctx->drv.pf_glMapBuffer
|
|
#define glUnmapBuffer ctx->drv.pf_glUnmapBuffer
|
|
|
|
#ifndef GL_PIXEL_UNPACK_BUFFER
|
|
#define GL_PIXEL_UNPACK_BUFFER GL_PIXEL_UNPACK_BUFFER_ARB
|
|
#endif
|
|
|
|
#ifndef GL_PIXEL_PACK_BUFFER
|
|
#define GL_PIXEL_PACK_BUFFER GL_PIXEL_PACK_BUFFER_ARB
|
|
#endif
|
|
|
|
#elif defined (HAVE_COGL_GLES2)
|
|
|
|
#include "../gles/cogl-gles2-wrapper.h"
|
|
|
|
#endif
|
|
|
|
static void
|
|
_cogl_pixel_array_free (CoglPixelArray *buffer);
|
|
|
|
COGL_BUFFER_DEFINE (PixelArray, pixel_array)
|
|
|
|
static CoglPixelArray *
|
|
_cogl_pixel_array_new (unsigned int size)
|
|
{
|
|
CoglPixelArray *pixel_array = g_slice_new0 (CoglPixelArray);
|
|
CoglBuffer *buffer = COGL_BUFFER (pixel_array);
|
|
gboolean use_malloc;
|
|
|
|
_COGL_GET_CONTEXT (ctx, COGL_INVALID_HANDLE);
|
|
|
|
if (!cogl_features_available (COGL_FEATURE_PBOS))
|
|
use_malloc = TRUE;
|
|
else
|
|
use_malloc = FALSE;
|
|
|
|
/* parent's constructor */
|
|
_cogl_buffer_initialize (buffer,
|
|
size,
|
|
use_malloc,
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
|
|
COGL_BUFFER_USAGE_HINT_TEXTURE,
|
|
COGL_BUFFER_UPDATE_HINT_STATIC);
|
|
|
|
/* return COGL_INVALID_HANDLE; */
|
|
return _cogl_pixel_array_object_new (pixel_array);
|
|
}
|
|
|
|
CoglPixelArray *
|
|
cogl_pixel_array_new_with_size (unsigned int width,
|
|
unsigned int height,
|
|
CoglPixelFormat format,
|
|
unsigned int *rowstride)
|
|
{
|
|
CoglPixelArray *buffer;
|
|
CoglPixelArray *pixel_array;
|
|
unsigned int stride;
|
|
|
|
/* creating a buffer to store "any" format does not make sense */
|
|
if (G_UNLIKELY (format == COGL_PIXEL_FORMAT_ANY))
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
/* for now we fallback to cogl_pixel_array_new, later, we could ask
|
|
* libdrm a tiled buffer for instance */
|
|
stride = width * _cogl_get_format_bpp (format);
|
|
if (rowstride)
|
|
*rowstride = stride;
|
|
|
|
buffer = _cogl_pixel_array_new (height * stride);
|
|
if (G_UNLIKELY (buffer == COGL_INVALID_HANDLE))
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
pixel_array = COGL_PIXEL_ARRAY (buffer);
|
|
pixel_array->width = width;
|
|
pixel_array->height = height;
|
|
pixel_array->format = format;
|
|
pixel_array->stride = stride;
|
|
|
|
return buffer;
|
|
}
|
|
|
|
static void
|
|
_cogl_pixel_array_free (CoglPixelArray *buffer)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
/* parent's destructor */
|
|
_cogl_buffer_fini (COGL_BUFFER (buffer));
|
|
|
|
GE( glDeleteBuffers (1, &(COGL_BUFFER (buffer)->gl_handle)) );
|
|
|
|
g_slice_free (CoglPixelArray, buffer);
|
|
}
|
|
|