brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use GL_OES_packed_depth_stencil on GLES2

Browse Source 
If the GL_OES_packed_depth_stencil extension is available then we can
try creating a combined depth-stencil buffer with the
GL_DEPTH24_STENCIL8 format. This adds a private flag for the feature.

https://bugzilla.gnome.org/show_bug.cgi?id=666184

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-02-22 17:02:28 +00:00
parent b52d24c933
commit 31bd4cb22c
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cogl/cogl-framebuffer.c
View File

@ -65,6 +65,9 @@
#ifndef GL_DEPTH_STENCIL #ifndef GL_DEPTH_STENCIL
#define GL_DEPTH_STENCIL 0x84F9 #define GL_DEPTH_STENCIL 0x84F9
#endif #endif
#ifndef GL_DEPTH24_STENCIL8
#define GL_DEPTH24_STENCIL8 0x88F0
#endif
#ifndef GL_DEPTH_ATTACHMENT #ifndef GL_DEPTH_ATTACHMENT
#define GL_DEPTH_ATTACHMENT 0x8D00 #define GL_DEPTH_ATTACHMENT 0x8D00
#endif #endif
@ -101,8 +104,9 @@
typedef enum { typedef enum {
_TRY_DEPTH_STENCIL = 1L<<0, _TRY_DEPTH_STENCIL = 1L<<0,
_TRY_DEPTH = 1L<<1, _TRY_DEPTH24_STENCIL8 = 1L<<1,
_TRY_STENCIL = 1L<<2 _TRY_DEPTH = 1L<<2,
_TRY_STENCIL = 1L<<3
} TryFBOFlags; } TryFBOFlags;
typedef struct _CoglFramebufferStackEntry typedef struct _CoglFramebufferStackEntry
@ -868,18 +872,21 @@ try_creating_fbo (CoglOffscreen *offscreen,
tex_gl_target, tex_gl_handle, tex_gl_target, tex_gl_handle,
offscreen->texture_level)); offscreen->texture_level));
if (flags & _TRY_DEPTH_STENCIL) if (flags & (_TRY_DEPTH_STENCIL | _TRY_DEPTH24_STENCIL8))
{ {
GLenum format = ((flags & _TRY_DEPTH_STENCIL) ?
GL_DEPTH_STENCIL : GL_DEPTH24_STENCIL8);
/* Create a renderbuffer for depth and stenciling */ /* Create a renderbuffer for depth and stenciling */
GE (ctx, glGenRenderbuffers (1, &gl_depth_stencil_handle)); GE (ctx, glGenRenderbuffers (1, &gl_depth_stencil_handle));
GE (ctx, glBindRenderbuffer (GL_RENDERBUFFER, gl_depth_stencil_handle)); GE (ctx, glBindRenderbuffer (GL_RENDERBUFFER, gl_depth_stencil_handle));
if (n_samples) if (n_samples)
GE (ctx, glRenderbufferStorageMultisampleIMG (GL_RENDERBUFFER, GE (ctx, glRenderbufferStorageMultisampleIMG (GL_RENDERBUFFER,
n_samples, n_samples,
GL_DEPTH_STENCIL, format,
width, height)); width, height));
else else
GE (ctx, glRenderbufferStorage (GL_RENDERBUFFER, GL_DEPTH_STENCIL, GE (ctx, glRenderbufferStorage (GL_RENDERBUFFER, format,
width, height)); width, height));
GE (ctx, glBindRenderbuffer (GL_RENDERBUFFER, 0)); GE (ctx, glBindRenderbuffer (GL_RENDERBUFFER, 0));
GE (ctx, glFramebufferRenderbuffer (GL_FRAMEBUFFER, GE (ctx, glFramebufferRenderbuffer (GL_FRAMEBUFFER,
@ -1009,6 +1016,9 @@ _cogl_offscreen_allocate (CoglOffscreen *offscreen,
((ctx->private_feature_flags & ((ctx->private_feature_flags &
COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL) && COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL) &&
try_creating_fbo (offscreen, flags = _TRY_DEPTH_STENCIL)) || try_creating_fbo (offscreen, flags = _TRY_DEPTH_STENCIL)) ||
((ctx->private_feature_flags &
COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL) &&
try_creating_fbo (offscreen, flags = _TRY_DEPTH24_STENCIL8)) ||
try_creating_fbo (offscreen, flags = _TRY_DEPTH | _TRY_STENCIL) || try_creating_fbo (offscreen, flags = _TRY_DEPTH | _TRY_STENCIL) ||
try_creating_fbo (offscreen, flags = _TRY_STENCIL) || try_creating_fbo (offscreen, flags = _TRY_STENCIL) ||
try_creating_fbo (offscreen, flags = _TRY_DEPTH) || try_creating_fbo (offscreen, flags = _TRY_DEPTH) ||

3
cogl/cogl-internal.h
View File

@ -106,7 +106,8 @@ typedef enum
COGL_PRIVATE_FEATURE_FOUR_CLIP_PLANES = 1L<<4, COGL_PRIVATE_FEATURE_FOUR_CLIP_PLANES = 1L<<4,
COGL_PRIVATE_FEATURE_PBOS = 1L<<5, COGL_PRIVATE_FEATURE_PBOS = 1L<<5,
COGL_PRIVATE_FEATURE_VBOS = 1L<<6, COGL_PRIVATE_FEATURE_VBOS = 1L<<6,
COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL = 1L<<7 COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL = 1L<<7,
COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL = 1L<<8
} CoglPrivateFeatureFlags; } CoglPrivateFeatureFlags;
/* Sometimes when evaluating pipelines, either during comparisons or /* Sometimes when evaluating pipelines, either during comparisons or

3
cogl/driver/gles/cogl-gles.c
View File

@ -162,6 +162,9 @@ _cogl_gles_update_features (CoglContext *context,
if (context->glEGLImageTargetTexture2D) if (context->glEGLImageTargetTexture2D)
private_flags |= COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE; private_flags |= COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE;
if (_cogl_check_extension ("GL_OES_packed_depth_stencil", gl_extensions))
private_flags |= COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL;
/* Cache features */ /* Cache features */
context->private_feature_flags |= private_flags; context->private_feature_flags |= private_flags;
context->feature_flags |= flags; context->feature_flags |= flags;