From 320cbc8b56659ba82fba69d05ddae2b446ca1d3e Mon Sep 17 00:00:00 2001 From: wayo Date: Mon, 1 Apr 2013 20:21:25 -0600 Subject: [PATCH] More formatting... --- hw/nv2a.c | 15 ++++++++++----- target-i386/gloffscreen_cgl.c | 8 ++++---- target-i386/gloffscreen_wgl.c | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/nv2a.c b/hw/nv2a.c index 7275b03ca9..7480f87899 100644 --- a/hw/nv2a.c +++ b/hw/nv2a.c @@ -1501,19 +1501,24 @@ static void pgraph_context_init(GraphicsContext *context) const GLubyte *extensions; extensions = glGetString (GL_EXTENSIONS); - assert(glo_check_extension(const GLubyte *)"GL_EXT_texture_compression_s3tc", + assert(glo_check_extension((const GLubyte *) + "GL_EXT_texture_compression_s3tc", extensions)); - assert(glo_check_extension(const GLubyte *)"GL_EXT_framebuffer_object", + assert(glo_check_extension((const GLubyte *) + "GL_EXT_framebuffer_object", extensions)); - assert(glo_check_extension(const GLubyte *)"GL_ARB_vertex_program", + assert(glo_check_extension((const GLubyte *) + "GL_ARB_vertex_program", extensions)); - assert(glo_check_extension(const GLubyte *)"GL_ARB_fragment_program", + assert(glo_check_extension((const GLubyte *) + "GL_ARB_fragment_program", extensions)); - assert(glo_check_extension(const GLubyte *)"GL_ARB_texture_rectangle", + assert(glo_check_extension((const GLubyte *) + "GL_ARB_texture_rectangle", extensions)); GLint max_vertex_attributes; diff --git a/target-i386/gloffscreen_cgl.c b/target-i386/gloffscreen_cgl.c index c18006115a..e755c500a4 100644 --- a/target-i386/gloffscreen_cgl.c +++ b/target-i386/gloffscreen_cgl.c @@ -82,10 +82,10 @@ GloContext *glo_context_create(int formatFlags) { GloContext *context; - context = (GloContext*)malloc(sizeof(GloContext)); + context = (GloContext *)malloc(sizeof(GloContext)); memset(context, 0, sizeof(GloContext)); - // pixel format attributes + /* pixel format attributes */ CGLPixelFormatAttribute attributes[] = { kCGLPFAAccelerated, (CGLPixelFormatAttribute)0 @@ -106,7 +106,7 @@ GloContext *glo_context_create(int formatFlags) } /* Check if an extension is available. */ -GLboolean glo_check_extension(const GLubyte *extName, +GLboolean glo_check_extension(const GLubyte *extName, const GLubyte *extString) { return gluCheckExtension(extName, extString); @@ -115,7 +115,7 @@ GLboolean glo_check_extension(const GLubyte *extName, /* Set current context */ void glo_set_current(GloContext *context) { - if(context == NULL) + if (context == NULL) CGLSetCurrentContext(NULL); else CGLSetCurrentContext(context->cglContext); diff --git a/target-i386/gloffscreen_wgl.c b/target-i386/gloffscreen_wgl.c index 4189ef144b..cc03a25fdc 100644 --- a/target-i386/gloffscreen_wgl.c +++ b/target-i386/gloffscreen_wgl.c @@ -281,9 +281,9 @@ void glo_context_destroy(GloContext *context) } -/* Check extension implementation for Windows. +/* Check extension implementation for Windows. * The Glu 1.2 framework in Windows doesn't include them... */ -GLboolean glo_check_extension(const GLubyte *extName, +GLboolean glo_check_extension(const GLubyte *extName, const GLubyte *extString) { char *p = (char *) glGetString(GL_EXTENSIONS);