From 0f670f391063cabdf5f0acb0b958d4a1a4f775df Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Fri, 17 Jun 2016 13:33:08 +0100 Subject: [PATCH] Backed out changeset dfe70885c37c (bug 1279657) --- gfx/gl/AndroidNativeWindow.cpp | 6 +- gfx/gl/GLBlitHelper.cpp | 4 +- gfx/gl/GLContext.cpp | 61 +++++++------- gfx/gl/GLContext.h | 96 ++++++++++----------- gfx/gl/GLContextCGL.h | 2 +- gfx/gl/GLContextEGL.h | 8 +- gfx/gl/GLContextGLX.h | 6 +- gfx/gl/GLContextProviderCGL.mm | 4 +- gfx/gl/GLContextProviderEGL.cpp | 6 +- gfx/gl/GLContextProviderGLX.cpp | 94 ++++++++++----------- gfx/gl/GLContextProviderWGL.cpp | 32 +++---- gfx/gl/GLContextSymbols.h | 42 +++++----- gfx/gl/GLLibraryEGL.cpp | 6 +- gfx/gl/GLLibraryEGL.h | 66 +++++++-------- gfx/gl/GLLibraryLoader.cpp | 22 ++--- gfx/gl/GLLibraryLoader.h | 24 +++--- gfx/gl/GLScreenBuffer.h | 2 +- gfx/gl/GLTextureImage.cpp | 4 +- gfx/gl/GLTextureImage.h | 2 +- gfx/gl/GLTypes.h | 16 ++-- gfx/gl/GLUploadHelpers.cpp | 20 ++--- gfx/gl/GLUploadHelpers.h | 2 +- gfx/gl/GLXLibrary.h | 144 ++++++++++++++++---------------- gfx/gl/SharedSurfaceIO.h | 4 +- gfx/gl/TextureImageCGL.h | 4 +- gfx/gl/TextureImageCGL.mm | 2 +- gfx/gl/TextureImageEGL.cpp | 4 +- gfx/gl/TextureImageEGL.h | 4 +- gfx/gl/WGLLibrary.h | 24 +++--- 29 files changed, 355 insertions(+), 356 deletions(-) diff --git a/gfx/gl/AndroidNativeWindow.cpp b/gfx/gl/AndroidNativeWindow.cpp index 513b6486df10..219dbb9c765a 100644 --- a/gfx/gl/AndroidNativeWindow.cpp +++ b/gfx/gl/AndroidNativeWindow.cpp @@ -131,10 +131,10 @@ private: typedef int32_t (*pfnANativeWindow_setBuffersGeometry)(void* window, int32_t width, int32_t height, int32_t format); pfnANativeWindow_setBuffersGeometry fANativeWindow_setBuffersGeometry; - typedef int32_t (*pfnANativeWindow_lock)(void* window, void* out_buffer, void* in_out_dirtyBounds); + typedef int32_t (*pfnANativeWindow_lock)(void *window, void *out_buffer, void *in_out_dirtyBounds); pfnANativeWindow_lock fANativeWindow_lock; - typedef int32_t (*pfnANativeWindow_unlockAndPost)(void* window); + typedef int32_t (*pfnANativeWindow_unlockAndPost)(void *window); pfnANativeWindow_unlockAndPost fANativeWindow_unlockAndPost; typedef AndroidWindowFormat (*pfnANativeWindow_getFormat)(void* window); @@ -247,7 +247,7 @@ AndroidNativeWindow::Lock(void** out_bits,int32_t* out_width, int32_t* out_heigh // Do not touch. uint32_t reserved[6]; - } ANativeWindow_Buffer; + } ANativeWindow_Buffer; ANativeWindow_Buffer buffer; diff --git a/gfx/gl/GLBlitHelper.cpp b/gfx/gl/GLBlitHelper.cpp index 438bbc51da23..2a6fb6094c39 100644 --- a/gfx/gl/GLBlitHelper.cpp +++ b/gfx/gl/GLBlitHelper.cpp @@ -236,8 +236,8 @@ GLBlitHelper::InitTexQuadProgram(BlitType target) bool success = false; - GLuint* programPtr; - GLuint* fragShaderPtr; + GLuint *programPtr; + GLuint *fragShaderPtr; const char* fragShaderSource; switch (target) { case ConvertEGLImage: diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp index e76076d8bd3f..69449032c82a 100644 --- a/gfx/gl/GLContext.cpp +++ b/gfx/gl/GLContext.cpp @@ -434,7 +434,7 @@ GLContext::~GLContext() { NS_ASSERTION(IsDestroyed(), "GLContext implementation must call MarkDestroyed in destructor!"); #ifdef MOZ_GL_DEBUG if (mSharedContext) { - GLContext* tip = mSharedContext; + GLContext *tip = mSharedContext; while (tip->mSharedContext) tip = tip->mSharedContext; tip->SharedContextDestroyed(this); @@ -1523,8 +1523,8 @@ GLContext::LoadMoreSymbols(const char* prefix, bool trygl) if (IsSupported(GLFeature::invalidate_framebuffer)) { const SymLoadStruct symbols[] = { - { (PRFuncPtr*) &mSymbols.fInvalidateFramebuffer, { "InvalidateFramebuffer", nullptr } }, - { (PRFuncPtr*) &mSymbols.fInvalidateSubFramebuffer, { "InvalidateSubFramebuffer", nullptr } }, + { (PRFuncPtr *) &mSymbols.fInvalidateFramebuffer, { "InvalidateFramebuffer", nullptr } }, + { (PRFuncPtr *) &mSymbols.fInvalidateSubFramebuffer, { "InvalidateSubFramebuffer", nullptr } }, END_SYMBOLS }; fnLoadForFeature(symbols, GLFeature::invalidate_framebuffer); @@ -1801,18 +1801,17 @@ GLContext::PlatformStartup() // Common code for checking for both GL extensions and GLX extensions. bool -GLContext::ListHasExtension(const GLubyte* extensions, const char* extension) +GLContext::ListHasExtension(const GLubyte *extensions, const char *extension) { // fix bug 612572 - we were crashing as we were calling this function with extensions==null if (extensions == nullptr || extension == nullptr) return false; - const GLubyte* start; - GLubyte* where; - GLubyte* terminator; + const GLubyte *start; + GLubyte *where, *terminator; /* Extension names should not have spaces. */ - where = (GLubyte*) strchr(extension, ' '); + where = (GLubyte *) strchr(extension, ' '); if (where || *extension == '\0') return false; @@ -1823,7 +1822,7 @@ GLContext::ListHasExtension(const GLubyte* extensions, const char* extension) */ start = extensions; for (;;) { - where = (GLubyte*) strstr((const char*) start, extension); + where = (GLubyte *) strstr((const char *) start, extension); if (!where) { break; } @@ -2211,19 +2210,19 @@ GLContext::AssertNotPassingStackBufferToTheGL(const void* ptr) } void -GLContext::CreatedProgram(GLContext* aOrigin, GLuint aName) +GLContext::CreatedProgram(GLContext *aOrigin, GLuint aName) { mTrackedPrograms.AppendElement(NamedResource(aOrigin, aName)); } void -GLContext::CreatedShader(GLContext* aOrigin, GLuint aName) +GLContext::CreatedShader(GLContext *aOrigin, GLuint aName) { mTrackedShaders.AppendElement(NamedResource(aOrigin, aName)); } void -GLContext::CreatedBuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) +GLContext::CreatedBuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames) { for (GLsizei i = 0; i < aCount; ++i) { mTrackedBuffers.AppendElement(NamedResource(aOrigin, aNames[i])); @@ -2231,7 +2230,7 @@ GLContext::CreatedBuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) } void -GLContext::CreatedQueries(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) +GLContext::CreatedQueries(GLContext *aOrigin, GLsizei aCount, GLuint *aNames) { for (GLsizei i = 0; i < aCount; ++i) { mTrackedQueries.AppendElement(NamedResource(aOrigin, aNames[i])); @@ -2239,7 +2238,7 @@ GLContext::CreatedQueries(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) } void -GLContext::CreatedTextures(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) +GLContext::CreatedTextures(GLContext *aOrigin, GLsizei aCount, GLuint *aNames) { for (GLsizei i = 0; i < aCount; ++i) { mTrackedTextures.AppendElement(NamedResource(aOrigin, aNames[i])); @@ -2247,7 +2246,7 @@ GLContext::CreatedTextures(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) } void -GLContext::CreatedFramebuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) +GLContext::CreatedFramebuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames) { for (GLsizei i = 0; i < aCount; ++i) { mTrackedFramebuffers.AppendElement(NamedResource(aOrigin, aNames[i])); @@ -2255,7 +2254,7 @@ GLContext::CreatedFramebuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aName } void -GLContext::CreatedRenderbuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames) +GLContext::CreatedRenderbuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames) { for (GLsizei i = 0; i < aCount; ++i) { mTrackedRenderbuffers.AppendElement(NamedResource(aOrigin, aNames[i])); @@ -2263,7 +2262,7 @@ GLContext::CreatedRenderbuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNam } static void -RemoveNamesFromArray(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames, nsTArray& aArray) +RemoveNamesFromArray(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames, nsTArray& aArray) { for (GLsizei j = 0; j < aCount; ++j) { GLuint name = aNames[j]; @@ -2281,49 +2280,49 @@ RemoveNamesFromArray(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames, n } void -GLContext::DeletedProgram(GLContext* aOrigin, GLuint aName) +GLContext::DeletedProgram(GLContext *aOrigin, GLuint aName) { RemoveNamesFromArray(aOrigin, 1, &aName, mTrackedPrograms); } void -GLContext::DeletedShader(GLContext* aOrigin, GLuint aName) +GLContext::DeletedShader(GLContext *aOrigin, GLuint aName) { RemoveNamesFromArray(aOrigin, 1, &aName, mTrackedShaders); } void -GLContext::DeletedBuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames) +GLContext::DeletedBuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames) { RemoveNamesFromArray(aOrigin, aCount, aNames, mTrackedBuffers); } void -GLContext::DeletedQueries(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames) +GLContext::DeletedQueries(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames) { RemoveNamesFromArray(aOrigin, aCount, aNames, mTrackedQueries); } void -GLContext::DeletedTextures(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames) +GLContext::DeletedTextures(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames) { RemoveNamesFromArray(aOrigin, aCount, aNames, mTrackedTextures); } void -GLContext::DeletedFramebuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames) +GLContext::DeletedFramebuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames) { RemoveNamesFromArray(aOrigin, aCount, aNames, mTrackedFramebuffers); } void -GLContext::DeletedRenderbuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames) +GLContext::DeletedRenderbuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames) { RemoveNamesFromArray(aOrigin, aCount, aNames, mTrackedRenderbuffers); } static void -MarkContextDestroyedInArray(GLContext* aContext, nsTArray& aArray) +MarkContextDestroyedInArray(GLContext *aContext, nsTArray& aArray) { for (uint32_t i = 0; i < aArray.Length(); ++i) { if (aArray[i].origin == aContext) @@ -2332,7 +2331,7 @@ MarkContextDestroyedInArray(GLContext* aContext, nsTArray& aArray) +ReportArrayContents(const char *title, const nsTArray& aArray) { if (aArray.Length() == 0) return; @@ -2354,7 +2353,7 @@ ReportArrayContents(const char* title, const nsTArray& nsTArray copy(aArray); copy.Sort(); - GLContext* lastContext = nullptr; + GLContext *lastContext = nullptr; for (uint32_t i = 0; i < copy.Length(); ++i) { if (lastContext != copy[i].origin) { if (lastContext) @@ -2508,12 +2507,12 @@ GLContext::ShouldDumpExts() } bool -DoesStringMatch(const char* aString, const char* aWantedString) +DoesStringMatch(const char* aString, const char *aWantedString) { if (!aString || !aWantedString) return false; - const char* occurrence = strstr(aString, aWantedString); + const char *occurrence = strstr(aString, aWantedString); // aWanted not found if (!occurrence) @@ -2524,7 +2523,7 @@ DoesStringMatch(const char* aString, const char* aWantedString) return false; // aWantedVendor followed by alpha character - const char* afterOccurrence = occurrence + strlen(aWantedString); + const char *afterOccurrence = occurrence + strlen(aWantedString); if (isalpha(*afterOccurrence)) return false; diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h index 662a8d632b6f..8956b1f5d254 100644 --- a/gfx/gl/GLContext.h +++ b/gfx/gl/GLContext.h @@ -762,9 +762,9 @@ private: } } - GLContext* TrackingContext() + GLContext *TrackingContext() { - GLContext* tip = this; + GLContext *tip = this; while (tip->mSharedContext) tip = tip->mSharedContext; return tip; @@ -1018,7 +1018,7 @@ public: AFTER_GL_CALL; } - void fCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* pixels) { + void fCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *pixels) { ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pixels); BEFORE_GL_CALL; mSymbols.fCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, pixels); @@ -1026,7 +1026,7 @@ public: mHeavyGLCallsSinceLastFlush = true; } - void fCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* pixels) { + void fCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *pixels) { ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pixels); BEFORE_GL_CALL; mSymbols.fCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, pixels); @@ -1120,7 +1120,7 @@ private: AFTER_GL_CALL; } - void raw_fDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices) { + void raw_fDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { BEFORE_GL_CALL; mSymbols.fDrawElements(mode, count, type, indices); AFTER_GL_CALL; @@ -1133,7 +1133,7 @@ public: AfterGLDrawCall(); } - void fDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices) { + void fDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { BeforeGLDrawCall(); raw_fDrawElements(mode, count, type, indices); AfterGLDrawCall(); @@ -1220,7 +1220,7 @@ public: void fGetIntegerv(GLenum pname, GLint* params); - void GetUIntegerv(GLenum pname, GLuint* params) { + void GetUIntegerv(GLenum pname, GLuint *params) { fGetIntegerv(pname, reinterpret_cast(params)); } @@ -1309,19 +1309,19 @@ public: const GLubyte* fGetString(GLenum name) { BEFORE_GL_CALL; - const GLubyte* result = mSymbols.fGetString(name); + const GLubyte *result = mSymbols.fGetString(name); AFTER_GL_CALL; return result; } - void fGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid* img) { + void fGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *img) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetTexImage); mSymbols.fGetTexImage(target, level, format, type, img); AFTER_GL_CALL; } - void fGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint* params) + void fGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetTexLevelParameteriv); @@ -1458,7 +1458,7 @@ public: AFTER_GL_CALL; } - void fLoadMatrixf(const GLfloat* matrix) { + void fLoadMatrixf(const GLfloat *matrix) { BEFORE_GL_CALL; mSymbols.fLoadMatrixf(matrix); AFTER_GL_CALL; @@ -1476,7 +1476,7 @@ public: AFTER_GL_CALL; } - void fTextureRangeAPPLE(GLenum target, GLsizei length, GLvoid* pointer) { + void fTextureRangeAPPLE(GLenum target, GLsizei length, GLvoid *pointer) { ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pointer); BEFORE_GL_CALL; mSymbols.fTextureRangeAPPLE(target, length, pointer); @@ -1515,7 +1515,7 @@ public: AFTER_GL_CALL; } - void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels) { + void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) { ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pixels); BEFORE_GL_CALL; mSymbols.fReadPixels(x, y, width, height, format, type, pixels); @@ -1598,14 +1598,14 @@ public: AFTER_GL_CALL; } - void fTexGenfv(GLenum coord, GLenum pname, const GLfloat* params) { + void fTexGenfv(GLenum coord, GLenum pname, const GLfloat *params) { BEFORE_GL_CALL; mSymbols.fTexGenfv(coord, pname, params); AFTER_GL_CALL; } private: - void raw_fTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels) { + void raw_fTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) { ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(pixels); BEFORE_GL_CALL; mSymbols.fTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); @@ -1614,7 +1614,7 @@ private: } public: - void fTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels) { + void fTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) { if (!IsTextureSizeSafeToPassToDriver(target, width, height)) { // pass wrong values to cause the GL to generate GL_INVALID_VALUE. // See bug 737182 and the comment in IsTextureSizeSafeToPassToDriver. @@ -2063,7 +2063,7 @@ public: void* fMapBuffer(GLenum target, GLenum access) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fMapBuffer); - void* ret = mSymbols.fMapBuffer(target, access); + void *ret = mSymbols.fMapBuffer(target, access); AFTER_GL_CALL; return ret; } @@ -2265,14 +2265,14 @@ public: AFTER_GL_CALL; } - void fGetInteger64v(GLenum pname, GLint64* params) { + void fGetInteger64v(GLenum pname, GLint64 *params) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetInteger64v); mSymbols.fGetInteger64v(pname, params); AFTER_GL_CALL; } - void fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values) { + void fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetSynciv); mSymbols.fGetSynciv(sync, pname, bufSize, length, values); @@ -2796,7 +2796,7 @@ public: AFTER_GL_CALL; } - void fDeleteVertexArrays(GLsizei n, const GLuint* arrays) + void fDeleteVertexArrays(GLsizei n, const GLuint *arrays) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fDeleteVertexArrays); @@ -2804,7 +2804,7 @@ public: AFTER_GL_CALL; } - void fGenVertexArrays(GLsizei n, GLuint* arrays) + void fGenVertexArrays(GLsizei n, GLuint *arrays) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGenVertexArrays); @@ -2930,7 +2930,7 @@ public: // ----------------------------------------------------------------------------- // Core GL & Extension ARB_sampler_objects public: - void fGenSamplers(GLsizei count, GLuint* samplers) + void fGenSamplers(GLsizei count, GLuint *samplers) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGenSamplers); @@ -2938,7 +2938,7 @@ public: AFTER_GL_CALL; } - void fDeleteSamplers(GLsizei count, const GLuint* samplers) + void fDeleteSamplers(GLsizei count, const GLuint *samplers) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fDeleteSamplers); @@ -2971,7 +2971,7 @@ public: AFTER_GL_CALL; } - void fSamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param) + void fSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fSamplerParameteriv); @@ -2987,7 +2987,7 @@ public: AFTER_GL_CALL; } - void fSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param) + void fSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fSamplerParameterfv); @@ -2995,7 +2995,7 @@ public: AFTER_GL_CALL; } - void fGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params) + void fGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetSamplerParameteriv); @@ -3003,7 +3003,7 @@ public: AFTER_GL_CALL; } - void fGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params) + void fGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params) { BEFORE_GL_CALL; ASSERT_SYMBOL_PRESENT(fGetSamplerParameterfv); @@ -3234,7 +3234,7 @@ public: return mSymbols.fUseProgram == nullptr; } - GLContext* GetSharedContext() { return mSharedContext; } + GLContext *GetSharedContext() { return mSharedContext; } /** * Returns true if the thread on which this context was created is the currently @@ -3342,8 +3342,8 @@ public: virtual bool RenewSurface(nsIWidget* aWidget) { return false; } // Shared code for GL extensions and GLX extensions. - static bool ListHasExtension(const GLubyte* extensions, - const char* extension); + static bool ListHasExtension(const GLubyte *extensions, + const char *extension); GLint GetMaxTextureImageSize() { return mMaxTextureImageSize; } @@ -3573,22 +3573,22 @@ public: #undef ASSERT_SYMBOL_PRESENT #ifdef MOZ_GL_DEBUG - void CreatedProgram(GLContext* aOrigin, GLuint aName); - void CreatedShader(GLContext* aOrigin, GLuint aName); - void CreatedBuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames); - void CreatedQueries(GLContext* aOrigin, GLsizei aCount, GLuint* aNames); - void CreatedTextures(GLContext* aOrigin, GLsizei aCount, GLuint* aNames); - void CreatedFramebuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames); - void CreatedRenderbuffers(GLContext* aOrigin, GLsizei aCount, GLuint* aNames); - void DeletedProgram(GLContext* aOrigin, GLuint aName); - void DeletedShader(GLContext* aOrigin, GLuint aName); - void DeletedBuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames); - void DeletedQueries(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames); - void DeletedTextures(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames); - void DeletedFramebuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames); - void DeletedRenderbuffers(GLContext* aOrigin, GLsizei aCount, const GLuint* aNames); + void CreatedProgram(GLContext *aOrigin, GLuint aName); + void CreatedShader(GLContext *aOrigin, GLuint aName); + void CreatedBuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames); + void CreatedQueries(GLContext *aOrigin, GLsizei aCount, GLuint *aNames); + void CreatedTextures(GLContext *aOrigin, GLsizei aCount, GLuint *aNames); + void CreatedFramebuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames); + void CreatedRenderbuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames); + void DeletedProgram(GLContext *aOrigin, GLuint aName); + void DeletedShader(GLContext *aOrigin, GLuint aName); + void DeletedBuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames); + void DeletedQueries(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames); + void DeletedTextures(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames); + void DeletedFramebuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames); + void DeletedRenderbuffers(GLContext *aOrigin, GLsizei aCount, const GLuint *aNames); - void SharedContextDestroyed(GLContext* aChild); + void SharedContextDestroyed(GLContext *aChild); void ReportOutstandingNames(); struct NamedResource { @@ -3596,11 +3596,11 @@ public: : origin(nullptr), name(0), originDeleted(false) { } - NamedResource(GLContext* aOrigin, GLuint aName) + NamedResource(GLContext *aOrigin, GLuint aName) : origin(aOrigin), name(aName), originDeleted(false) { } - GLContext* origin; + GLContext *origin; GLuint name; bool originDeleted; @@ -3639,7 +3639,7 @@ public: void Readback(SharedSurface* src, gfx::DataSourceSurface* dest); }; -bool DoesStringMatch(const char* aString, const char* aWantedString); +bool DoesStringMatch(const char* aString, const char *aWantedString); void SplitByChar(const nsACString& str, const char delim, std::vector* const out); diff --git a/gfx/gl/GLContextCGL.h b/gfx/gl/GLContextCGL.h index 249e47b0e8d3..48efb1c077f0 100644 --- a/gfx/gl/GLContextCGL.h +++ b/gfx/gl/GLContextCGL.h @@ -24,7 +24,7 @@ class GLContextCGL : public GLContext { friend class GLContextProviderCGL; - NSOpenGLContext* mContext; + NSOpenGLContext *mContext; public: MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextCGL, override) diff --git a/gfx/gl/GLContextEGL.h b/gfx/gl/GLContextEGL.h index 97e9decc17f9..8609517f3a4a 100644 --- a/gfx/gl/GLContextEGL.h +++ b/gfx/gl/GLContextEGL.h @@ -20,7 +20,7 @@ class GLContextEGL : public GLContext static already_AddRefed CreateGLContext(CreateContextFlags flags, const SurfaceCaps& caps, - GLContextEGL* shareContext, + GLContextEGL *shareContext, bool isOffscreen, EGLConfig config, EGLSurface surface, @@ -90,7 +90,7 @@ public: // hold a reference to the given surface // for the lifetime of this context. - void HoldSurface(gfxASurface* aSurf); + void HoldSurface(gfxASurface *aSurf); EGLSurface GetEGLSurface() const { return mSurface; @@ -100,8 +100,8 @@ public: return sEGLLibrary.Display(); } - bool BindTex2DOffscreen(GLContext* aOffscreen); - void UnbindTex2DOffscreen(GLContext* aOffscreen); + bool BindTex2DOffscreen(GLContext *aOffscreen); + void UnbindTex2DOffscreen(GLContext *aOffscreen); void BindOffscreenFramebuffer(); static already_AddRefed diff --git a/gfx/gl/GLContextGLX.h b/gfx/gl/GLContextGLX.h index 6f9e1c24b037..3540e297be64 100644 --- a/gfx/gl/GLContextGLX.h +++ b/gfx/gl/GLContextGLX.h @@ -73,16 +73,16 @@ private: GLContextGLX(const SurfaceCaps& caps, GLContext* shareContext, bool isOffscreen, - Display* aDisplay, + Display *aDisplay, GLXDrawable aDrawable, GLXContext aContext, bool aDeleteDrawable, bool aDoubleBuffered, - gfxXlibSurface* aPixmap, + gfxXlibSurface *aPixmap, ContextProfile profile); GLXContext mContext; - Display* mDisplay; + Display *mDisplay; GLXDrawable mDrawable; bool mDeleteDrawable; bool mDoubleBuffered; diff --git a/gfx/gl/GLContextProviderCGL.mm b/gfx/gl/GLContextProviderCGL.mm index ff6a3abe17ed..618f4660ce23 100644 --- a/gfx/gl/GLContextProviderCGL.mm +++ b/gfx/gl/GLContextProviderCGL.mm @@ -65,7 +65,7 @@ public: private: bool mInitialized; bool mUseDoubleBufferedWindows; - PRLibrary* mOGLLibrary; + PRLibrary *mOGLLibrary; }; CGLLibrary sCGLLibrary; @@ -234,7 +234,7 @@ CreateWithFormat(const NSOpenGLPixelFormatAttribute* attribs) } already_AddRefed -GLContextProviderCGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated) +GLContextProviderCGL::CreateForWindow(nsIWidget *aWidget, bool aForceAccelerated) { if (!sCGLLibrary.EnsureInitialized()) { return nullptr; diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp index 623b22de2036..a0f20c52af12 100644 --- a/gfx/gl/GLContextProviderEGL.cpp +++ b/gfx/gl/GLContextProviderEGL.cpp @@ -452,7 +452,7 @@ GLContextEGL::SwapBuffers() // hold a reference to the given surface // for the lifetime of this context. void -GLContextEGL::HoldSurface(gfxASurface* aSurf) { +GLContextEGL::HoldSurface(gfxASurface *aSurf) { mThebesSurface = aSurf; } @@ -490,7 +490,7 @@ GLContextEGL::DestroySurface(EGLSurface aSurface) already_AddRefed GLContextEGL::CreateGLContext(CreateContextFlags flags, const SurfaceCaps& caps, - GLContextEGL* shareContext, + GLContextEGL *shareContext, bool isOffscreen, EGLConfig config, EGLSurface surface, @@ -772,7 +772,7 @@ GLContextProviderEGL::CreateWrappingExisting(void* aContext, void* aSurface) } already_AddRefed -GLContextProviderEGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated) +GLContextProviderEGL::CreateForWindow(nsIWidget *aWidget, bool aForceAccelerated) { nsCString discardFailureId; if (!sEGLLibrary.EnsureInitialized(false, discardFailureId)) { diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp index 9e9f4e30361c..58214bf1a83d 100644 --- a/gfx/gl/GLContextProviderGLX.cpp +++ b/gfx/gl/GLContextProviderGLX.cpp @@ -6,7 +6,7 @@ #ifdef MOZ_WIDGET_GTK #include #include -#define GET_NATIVE_WINDOW(aWidget) GDK_WINDOW_XID((GdkWindow*) aWidget->GetNativeData(NS_NATIVE_WINDOW)) +#define GET_NATIVE_WINDOW(aWidget) GDK_WINDOW_XID((GdkWindow *) aWidget->GetNativeData(NS_NATIVE_WINDOW)) #elif defined(MOZ_WIDGET_QT) #define GET_NATIVE_WINDOW(aWidget) (Window)(aWidget->GetNativeData(NS_NATIVE_SHAREABLE_WINDOW)) #endif @@ -180,7 +180,7 @@ GLXLibrary::EnsureInitialized() return false; } - Display* display = DefaultXDisplay(); + Display *display = DefaultXDisplay(); int screen = DefaultScreen(display); if (!xQueryVersion(display, &mGLXMajorVersion, &mGLXMinorVersion)) { @@ -193,11 +193,11 @@ GLXLibrary::EnsureInitialized() // Not possible to query for extensions. return false; - const char* clientVendor = xGetClientString(display, LOCAL_GLX_VENDOR); - const char* serverVendor = xQueryServerString(display, screen, LOCAL_GLX_VENDOR); - const char* extensionsStr = xQueryExtensionsString(display, screen); + const char *clientVendor = xGetClientString(display, LOCAL_GLX_VENDOR); + const char *serverVendor = xQueryServerString(display, screen, LOCAL_GLX_VENDOR); + const char *extensionsStr = xQueryExtensionsString(display, screen); - GLLibraryLoader::SymLoadStruct* sym13; + GLLibraryLoader::SymLoadStruct *sym13; if (!GLXVersionCheck(1, 3)) { // Even if we don't have 1.3, we might have equivalent extensions // (as on the Intel X server). @@ -213,7 +213,7 @@ GLXLibrary::EnsureInitialized() return false; } - GLLibraryLoader::SymLoadStruct* sym14; + GLLibraryLoader::SymLoadStruct *sym14; if (!GLXVersionCheck(1, 4)) { // Even if we don't have 1.4, we might have equivalent extensions // (as on the Intel X server). @@ -299,8 +299,8 @@ GLXLibrary::CreatePixmap(gfxASurface* aSurface) return None; } - gfxXlibSurface* xs = static_cast(aSurface); - const XRenderPictFormat* format = xs->XRenderFormat(); + gfxXlibSurface *xs = static_cast(aSurface); + const XRenderPictFormat *format = xs->XRenderFormat(); if (!format || format->type != PictTypeDirect) { return None; } @@ -318,7 +318,7 @@ GLXLibrary::CreatePixmap(gfxASurface* aSurface) None }; int numConfigs = 0; - Display* display = xs->XDisplay(); + Display *display = xs->XDisplay(); int xscreen = DefaultScreen(display); ScopedXFree cfgs(xChooseFBConfig(display, @@ -341,7 +341,7 @@ GLXLibrary::CreatePixmap(gfxASurface* aSurface) for (int i = 0; i < numConfigs; i++) { int id = None; sGLXLibrary.xGetFBConfigAttrib(display, cfgs[i], LOCAL_GLX_VISUAL_ID, &id); - Visual* visual; + Visual *visual; int depth; FindVisualAndDepth(display, id, &visual, &depth); if (!visual || @@ -484,9 +484,9 @@ GLXLibrary::UpdateTexImage(Display* aDisplay, GLXPixmap aPixmap) #ifdef DEBUG -static int (*sOldErrorHandler)(Display*, XErrorEvent*); +static int (*sOldErrorHandler)(Display *, XErrorEvent *); ScopedXErrorHandler::ErrorEvent sErrorEvent; -static int GLXErrorHandler(Display* display, XErrorEvent* ev) +static int GLXErrorHandler(Display *display, XErrorEvent *ev) { if (!sErrorEvent.mError.error_code) { sErrorEvent.mError = *ev; @@ -566,7 +566,7 @@ GLXLibrary::xGetCurrentContext() } /* static */ void* -GLXLibrary::xGetProcAddress(const char* procName) +GLXLibrary::xGetProcAddress(const char *procName) { BEFORE_GLX_CALL; void* result = sGLXLibrary.xGetProcAddressInternal(procName); @@ -577,8 +577,8 @@ GLXLibrary::xGetProcAddress(const char* procName) GLXFBConfig* GLXLibrary::xChooseFBConfig(Display* display, int screen, - const int* attrib_list, - int* nelements) + const int *attrib_list, + int *nelements) { BEFORE_GLX_CALL; GLXFBConfig* result = xChooseFBConfigInternal(display, screen, attrib_list, nelements); @@ -589,7 +589,7 @@ GLXLibrary::xChooseFBConfig(Display* display, GLXFBConfig* GLXLibrary::xGetFBConfigs(Display* display, int screen, - int* nelements) + int *nelements) { BEFORE_GLX_CALL; GLXFBConfig* result = xGetFBConfigsInternal(display, screen, nelements); @@ -613,10 +613,10 @@ GLXLibrary::xCreateNewContext(Display* display, } int -GLXLibrary::xGetFBConfigAttrib(Display* display, +GLXLibrary::xGetFBConfigAttrib(Display *display, GLXFBConfig config, int attribute, - int* value) + int *value) { BEFORE_GLX_CALL; int result = xGetFBConfigAttribInternal(display, config, @@ -626,48 +626,48 @@ GLXLibrary::xGetFBConfigAttrib(Display* display, } void -GLXLibrary::xSwapBuffers(Display* display, GLXDrawable drawable) +GLXLibrary::xSwapBuffers(Display *display, GLXDrawable drawable) { BEFORE_GLX_CALL; xSwapBuffersInternal(display, drawable); AFTER_GLX_CALL; } -const char* -GLXLibrary::xQueryExtensionsString(Display* display, +const char * +GLXLibrary::xQueryExtensionsString(Display *display, int screen) { BEFORE_GLX_CALL; - const char* result = xQueryExtensionsStringInternal(display, screen); + const char *result = xQueryExtensionsStringInternal(display, screen); AFTER_GLX_CALL; return result; } -const char* -GLXLibrary::xGetClientString(Display* display, +const char * +GLXLibrary::xGetClientString(Display *display, int screen) { BEFORE_GLX_CALL; - const char* result = xGetClientStringInternal(display, screen); + const char *result = xGetClientStringInternal(display, screen); AFTER_GLX_CALL; return result; } -const char* -GLXLibrary::xQueryServerString(Display* display, +const char * +GLXLibrary::xQueryServerString(Display *display, int screen, int name) { BEFORE_GLX_CALL; - const char* result = xQueryServerStringInternal(display, screen, name); + const char *result = xQueryServerStringInternal(display, screen, name); AFTER_GLX_CALL; return result; } GLXPixmap -GLXLibrary::xCreatePixmap(Display* display, +GLXLibrary::xCreatePixmap(Display *display, GLXFBConfig config, Pixmap pixmap, - const int* attrib_list) + const int *attrib_list) { BEFORE_GLX_CALL; GLXPixmap result = xCreatePixmapInternal(display, config, @@ -677,7 +677,7 @@ GLXLibrary::xCreatePixmap(Display* display, } GLXPixmap -GLXLibrary::xCreateGLXPixmapWithConfig(Display* display, +GLXLibrary::xCreateGLXPixmapWithConfig(Display *display, GLXFBConfig config, Pixmap pixmap) { @@ -688,7 +688,7 @@ GLXLibrary::xCreateGLXPixmapWithConfig(Display* display, } void -GLXLibrary::xDestroyPixmap(Display* display, GLXPixmap pixmap) +GLXLibrary::xDestroyPixmap(Display *display, GLXPixmap pixmap) { BEFORE_GLX_CALL; xDestroyPixmapInternal(display, pixmap); @@ -696,9 +696,9 @@ GLXLibrary::xDestroyPixmap(Display* display, GLXPixmap pixmap) } Bool -GLXLibrary::xQueryVersion(Display* display, - int* major, - int* minor) +GLXLibrary::xQueryVersion(Display *display, + int *major, + int *minor) { BEFORE_GLX_CALL; Bool result = xQueryVersionInternal(display, major, minor); @@ -707,10 +707,10 @@ GLXLibrary::xQueryVersion(Display* display, } void -GLXLibrary::xBindTexImage(Display* display, +GLXLibrary::xBindTexImage(Display *display, GLXDrawable drawable, int buffer, - const int* attrib_list) + const int *attrib_list) { BEFORE_GLX_CALL; xBindTexImageInternal(display, drawable, buffer, attrib_list); @@ -718,7 +718,7 @@ GLXLibrary::xBindTexImage(Display* display, } void -GLXLibrary::xReleaseTexImage(Display* display, +GLXLibrary::xReleaseTexImage(Display *display, GLXDrawable drawable, int buffer) { @@ -1009,12 +1009,12 @@ GLContextGLX::GLContextGLX( const SurfaceCaps& caps, GLContext* shareContext, bool isOffscreen, - Display* aDisplay, + Display *aDisplay, GLXDrawable aDrawable, GLXContext aContext, bool aDeleteDrawable, bool aDoubleBuffered, - gfxXlibSurface* aPixmap, + gfxXlibSurface *aPixmap, ContextProfile profile) : GLContext(caps, shareContext, isOffscreen),//aDeleteDrawable ? true : false, aShareContext, ), mContext(aContext), @@ -1032,14 +1032,14 @@ GLContextGLX::GLContextGLX( } -static GLContextGLX* +static GLContextGLX * GetGlobalContextGLX() { return static_cast(GLContextProviderGLX::GetGlobalContext()); } static bool -AreCompatibleVisuals(Visual* one, Visual* two) +AreCompatibleVisuals(Visual *one, Visual *two) { if (one->c_class != two->c_class) { return false; @@ -1090,7 +1090,7 @@ GLContextProviderGLX::CreateWrappingExisting(void* aContext, void* aSurface) } already_AddRefed -GLContextProviderGLX::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated) +GLContextProviderGLX::CreateForWindow(nsIWidget *aWidget, bool aForceAccelerated) { if (!sGLXLibrary.EnsureInitialized()) { return nullptr; @@ -1103,7 +1103,7 @@ GLContextProviderGLX::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated // performance might be suboptimal. But using the existing visual // is a relatively safe intermediate step. - Display* display = (Display*)aWidget->GetNativeData(NS_NATIVE_DISPLAY); + Display *display = (Display*)aWidget->GetNativeData(NS_NATIVE_DISPLAY); if (!display) { NS_ERROR("X Display required for GLX Context provider"); return nullptr; @@ -1121,7 +1121,7 @@ GLContextProviderGLX::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated return nullptr; } - GLContextGLX* shareContext = GetGlobalContextGLX(); + GLContextGLX *shareContext = GetGlobalContextGLX(); SurfaceCaps caps = SurfaceCaps::Any(); RefPtr glContext = GLContextGLX::CreateGLContext(caps, @@ -1242,7 +1242,7 @@ GLContextGLX::FindFBConfigForWindow(Display* display, int screen, Window window, } if (sGLXLibrary.IsATI()) { int depth; - Visual* visual; + Visual *visual; FindVisualAndDepth(display, visid, &visual, &depth); if (depth == windowAttrs.depth && AreCompatibleVisuals(windowAttrs.visual, visual)) { diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp index 84921e73200d..02b379887c84 100644 --- a/gfx/gl/GLContextProviderWGL.cpp +++ b/gfx/gl/GLContextProviderWGL.cpp @@ -26,7 +26,7 @@ using namespace mozilla::gfx; WGLLibrary sWGLLib; HWND -WGLLibrary::CreateDummyWindow(HDC* aWindowDC) +WGLLibrary::CreateDummyWindow(HDC *aWindowDC) { WNDCLASSW wc; if (!GetClassInfoW(GetModuleHandle(nullptr), L"GLContextWGLClass", &wc)) { @@ -177,24 +177,24 @@ WGLLibrary::EnsureInitialized() } GLLibraryLoader::SymLoadStruct extensionsSymbols[] = { - { (PRFuncPtr*) &fGetExtensionsString, { "wglGetExtensionsStringARB", nullptr} }, + { (PRFuncPtr *) &fGetExtensionsString, { "wglGetExtensionsStringARB", nullptr} }, { nullptr, { nullptr } } }; GLLibraryLoader::SymLoadStruct robustnessSymbols[] = { - { (PRFuncPtr*) &fCreateContextAttribs, { "wglCreateContextAttribsARB", nullptr} }, + { (PRFuncPtr *) &fCreateContextAttribs, { "wglCreateContextAttribsARB", nullptr} }, { nullptr, { nullptr } } }; GLLibraryLoader::SymLoadStruct dxInteropSymbols[] = { - { (PRFuncPtr*)&fDXSetResourceShareHandle,{ "wglDXSetResourceShareHandleNV", nullptr } }, - { (PRFuncPtr*)&fDXOpenDevice, { "wglDXOpenDeviceNV", nullptr } }, - { (PRFuncPtr*)&fDXCloseDevice, { "wglDXCloseDeviceNV", nullptr } }, - { (PRFuncPtr*)&fDXRegisterObject, { "wglDXRegisterObjectNV", nullptr } }, - { (PRFuncPtr*)&fDXUnregisterObject, { "wglDXUnregisterObjectNV", nullptr } }, - { (PRFuncPtr*)&fDXObjectAccess, { "wglDXObjectAccessNV", nullptr } }, - { (PRFuncPtr*)&fDXLockObjects, { "wglDXLockObjectsNV", nullptr } }, - { (PRFuncPtr*)&fDXUnlockObjects, { "wglDXUnlockObjectsNV", nullptr } }, + { (PRFuncPtr *)&fDXSetResourceShareHandle,{ "wglDXSetResourceShareHandleNV", nullptr } }, + { (PRFuncPtr *)&fDXOpenDevice, { "wglDXOpenDeviceNV", nullptr } }, + { (PRFuncPtr *)&fDXCloseDevice, { "wglDXCloseDeviceNV", nullptr } }, + { (PRFuncPtr *)&fDXRegisterObject, { "wglDXRegisterObjectNV", nullptr } }, + { (PRFuncPtr *)&fDXUnregisterObject, { "wglDXUnregisterObjectNV", nullptr } }, + { (PRFuncPtr *)&fDXObjectAccess, { "wglDXObjectAccessNV", nullptr } }, + { (PRFuncPtr *)&fDXLockObjects, { "wglDXLockObjectsNV", nullptr } }, + { (PRFuncPtr *)&fDXUnlockObjects, { "wglDXUnlockObjectsNV", nullptr } }, { nullptr, { nullptr } } }; @@ -401,7 +401,7 @@ GetMaxSize(HDC hDC, int format, IntSize& size) int query[] = {LOCAL_WGL_MAX_PBUFFER_WIDTH_ARB, LOCAL_WGL_MAX_PBUFFER_HEIGHT_ARB}; int result[2]; - // (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int* piValues) + // (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues) if (!sWGLLib.fGetPixelFormatAttribiv(hDC, format, 0, 2, query, result)) return false; @@ -439,7 +439,7 @@ GLContextProviderWGL::CreateWrappingExisting(void*, void*) } already_AddRefed -GLContextProviderWGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated) +GLContextProviderWGL::CreateForWindow(nsIWidget *aWidget, bool aForceAccelerated) { if (!sWGLLib.EnsureInitialized()) { return nullptr; @@ -456,7 +456,7 @@ GLContextProviderWGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated SetPixelFormat(dc, sWGLLib.GetWindowPixelFormat(), nullptr); HGLRC context; - GLContextWGL* shareContext = GetGlobalContextWGL(); + GLContextWGL *shareContext = GetGlobalContextWGL(); if (sWGLLib.HasRobustness()) { int attribs[] = { @@ -501,7 +501,7 @@ GLContextProviderWGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated static already_AddRefed CreatePBufferOffscreenContext(const IntSize& aSize, - GLContextWGL* aShareContext) + GLContextWGL *aShareContext) { WGLLibrary& wgl = sWGLLib; @@ -595,7 +595,7 @@ static already_AddRefed CreateWindowOffscreenContext() { // CreateWindowOffscreenContext must return a global-shared context - GLContextWGL* shareContext = GetGlobalContextWGL(); + GLContextWGL *shareContext = GetGlobalContextWGL(); if (!shareContext) { return nullptr; } diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h index 58152f3807ef..aec5d2617e0e 100644 --- a/gfx/gl/GLContextSymbols.h +++ b/gfx/gl/GLContextSymbols.h @@ -79,9 +79,9 @@ struct GLContextSymbols PFNGLCLEARSTENCILPROC fClearStencil; typedef void (GLAPIENTRY * PFNGLCOLORMASKPROC) (realGLboolean red, realGLboolean green, realGLboolean blue, realGLboolean alpha); PFNGLCOLORMASKPROC fColorMask; - typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* pixels); + typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *pixels); PFNGLCOMPRESSEDTEXIMAGE2D fCompressedTexImage2D; - typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* pixels); + typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *pixels); PFNGLCOMPRESSEDTEXSUBIMAGE2D fCompressedTexSubImage2D; typedef void (GLAPIENTRY * PFNGLCULLFACEPROC) (GLenum mode); PFNGLCULLFACEPROC fCullFace; @@ -101,7 +101,7 @@ struct GLContextSymbols PFNGLDRAWBUFFERPROC fDrawBuffer; typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs); PFNGLDRAWBUFFERSPROC fDrawBuffers; - typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); + typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); PFNGLDRAWELEMENTSPROC fDrawElements; typedef void (GLAPIENTRY * PFNGLENABLEPROC) (GLenum); PFNGLENABLEPROC fEnable; @@ -123,11 +123,11 @@ struct GLContextSymbols PFNGLGETATTACHEDSHADERSPROC fGetAttachedShaders; typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name); PFNGLGETATTRIBLOCATIONPROC fGetAttribLocation; - typedef void (GLAPIENTRY * PFNGLGETINTEGERVPROC) (GLenum pname, GLint* params); + typedef void (GLAPIENTRY * PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params); PFNGLGETINTEGERVPROC fGetIntegerv; - typedef void (GLAPIENTRY * PFNGLGETFLOATVPROC) (GLenum pname, GLfloat* params); + typedef void (GLAPIENTRY * PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *params); PFNGLGETFLOATVPROC fGetFloatv; - typedef void (GLAPIENTRY * PFNGLGETBOOLEANBPROC) (GLenum pname, realGLboolean* params); + typedef void (GLAPIENTRY * PFNGLGETBOOLEANBPROC) (GLenum pname, realGLboolean *params); PFNGLGETBOOLEANBPROC fGetBooleanv; typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); PFNGLGETBUFFERPARAMETERIVPROC fGetBufferParameteriv; @@ -161,11 +161,11 @@ struct GLContextSymbols PFNGLGETSTRINGPROC fGetString; typedef void (GLAPIENTRY * PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid* image); PFNGLGETTEXIMAGEPROC fGetTexImage; - typedef void (GLAPIENTRY * PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint* params); + typedef void (GLAPIENTRY * PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params); PFNGLGETTEXLEVELPARAMETERIVPROC fGetTexLevelParameteriv; - typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat* params); + typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); PFNGLGETTEXPARAMETERFVPROC fGetTexParameterfv; - typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); + typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); PFNGLGETTEXPARAMETERIVPROC fGetTexParameteriv; typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params); PFNGLGETUNIFORMFVPROC fGetUniformfv; @@ -207,7 +207,7 @@ struct GLContextSymbols PFNGLPOLYGONOFFSETPROC fPolygonOffset; typedef void (GLAPIENTRY * PFNGLREADBUFFERPROC) (GLenum); PFNGLREADBUFFERPROC fReadBuffer; - typedef void (GLAPIENTRY * PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); + typedef void (GLAPIENTRY * PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); PFNGLREADPIXELSPROC fReadPixels; typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, realGLboolean invert); PFNGLSAMPLECOVERAGEPROC fSampleCoverage; @@ -223,11 +223,11 @@ struct GLContextSymbols PFNGLSTENCILOPPROC fStencilOp; typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); PFNGLSTENCILOPSEPARATEPROC fStencilOpSeparate; - typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); + typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); PFNGLTEXIMAGE2DPROC fTexImage2D; typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels); PFNGLTEXSUBIMAGE2DPROC fTexSubImage2D; - typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, GLvoid* pointer); + typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, GLvoid *pointer); PFNGLTEXTURERANGEAPPLEPROC fTextureRangeAPPLE; typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); PFNGLUNIFORM1FPROC fUniform1f; @@ -417,7 +417,7 @@ struct GLContextSymbols PFNGLGENBUFFERSPROC fGenBuffers; typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* queries); PFNGLGENQUERIESPROC fGenQueries; - typedef void (GLAPIENTRY * PFNGLGENTEXTURESPROC) (GLsizei n, GLuint* textures); + typedef void (GLAPIENTRY * PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures); PFNGLGENTEXTURESPROC fGenTextures; typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERS) (GLsizei n, GLuint* ids); PFNGLGENFRAMEBUFFERS fGenFramebuffers; @@ -468,9 +468,9 @@ struct GLContextSymbols PFNGLCLIENTWAITSYNC fClientWaitSync; typedef void (GLAPIENTRY * PFNGLWAITSYNC) (GLsync sync, GLbitfield flags, GLuint64 timeout); PFNGLWAITSYNC fWaitSync; - typedef void (GLAPIENTRY * PFNGLGETINTEGER64V) (GLenum pname, GLint64* params); + typedef void (GLAPIENTRY * PFNGLGETINTEGER64V) (GLenum pname, GLint64 *params); PFNGLGETINTEGER64V fGetInteger64v; - typedef void (GLAPIENTRY * PFNGLGETSYNCIV) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values); + typedef void (GLAPIENTRY * PFNGLGETSYNCIV) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); PFNGLGETSYNCIV fGetSynciv; // OES_egl_image @@ -580,9 +580,9 @@ struct GLContextSymbols PFNGLFLUSHMAPPEDBUFFERRANGEPROC fFlushMappedBufferRange; // sampler_object - typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers); + typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers); PFNGLGENSAMPLERSPROC fGenSamplers; - typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint* samplers); + typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers); PFNGLDELETESAMPLERSPROC fDeleteSamplers; typedef realGLboolean (GLAPIENTRY * PFNGLISSAMPLERPROC) (GLuint sampler); PFNGLISSAMPLERPROC fIsSampler; @@ -590,15 +590,15 @@ struct GLContextSymbols PFNGLBINDSAMPLERPROC fBindSampler; typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); PFNGLSAMPLERPARAMETERIPROC fSamplerParameteri; - typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint* param); + typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param); PFNGLSAMPLERPARAMETERIVPROC fSamplerParameteriv; typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); PFNGLSAMPLERPARAMETERFPROC fSamplerParameterf; - typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* param); + typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param); PFNGLSAMPLERPARAMETERFVPROC fSamplerParameterfv; - typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint* params); + typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params); PFNGLGETSAMPLERPARAMETERIVPROC fGetSamplerParameteriv; - typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat* params); + typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); PFNGLGETSAMPLERPARAMETERFVPROC fGetSamplerParameterfv; // texture_storage diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp index 6f8ff1f73322..ed8c2a703998 100644 --- a/gfx/gl/GLLibraryEGL.cpp +++ b/gfx/gl/GLLibraryEGL.cpp @@ -35,7 +35,7 @@ MOZ_THREAD_LOCAL(EGLContext) GLLibraryEGL::sCurrentContext; #endif // should match the order of EGLExtensions, and be null-terminated. -static const char* sEGLExtensionNames[] = { +static const char *sEGLExtensionNames[] = { "EGL_KHR_image_base", "EGL_KHR_image_pixmap", "EGL_KHR_gl_texture_2D_image", @@ -129,7 +129,7 @@ GetAndInitWARPDisplay(GLLibraryEGL& egl, void* displayType) if (display == EGL_NO_DISPLAY) { const EGLint err = egl.fGetError(); if (err != LOCAL_EGL_SUCCESS) { - gfxCriticalError() << "Unexpected GL error: " << gfx::hexa(err); + gfxCriticalError() << "Unexpected GL error: " << gfx::hexa(err); MOZ_CRASH("GFX: Unexpected GL error."); } return EGL_NO_DISPLAY; @@ -672,7 +672,7 @@ GLLibraryEGL::DumpEGLConfigs() { int nc = 0; fGetConfigs(mEGLDisplay, nullptr, 0, &nc); - EGLConfig* ec = new EGLConfig[nc]; + EGLConfig *ec = new EGLConfig[nc]; fGetConfigs(mEGLDisplay, ec, nc, &nc); for (int i = 0; i < nc; ++i) { diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h index 5629e50d1231..34228cbfb8b5 100644 --- a/gfx/gl/GLLibraryEGL.h +++ b/gfx/gl/GLLibraryEGL.h @@ -251,7 +251,7 @@ public: return b; } - EGLContext fCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list) + EGLContext fCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLContext ctx = mSymbols.fCreateContext(dpy, config, share_context, attrib_list); @@ -267,7 +267,7 @@ public: return b; } - EGLSurface fCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list) + EGLSurface fCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLSurface surf = mSymbols.fCreateWindowSurface(dpy, config, win, attrib_list); @@ -275,7 +275,7 @@ public: return surf; } - EGLSurface fCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint* attrib_list) + EGLSurface fCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLSurface surf = mSymbols.fCreatePbufferSurface(dpy, config, attrib_list); @@ -283,7 +283,7 @@ public: return surf; } - EGLSurface fCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint* attrib_list) + EGLSurface fCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLSurface surf = mSymbols.fCreatePixmapSurface(dpy, config, pixmap, attrib_list); @@ -307,7 +307,7 @@ public: return b; } - EGLBoolean fChooseConfig(EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config) + EGLBoolean fChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fChooseConfig(dpy, attrib_list, configs, config_size, num_config); @@ -323,7 +323,7 @@ public: return i; } - EGLBoolean fGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint* value) + EGLBoolean fGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fGetConfigAttrib(dpy, config, attribute, value); @@ -331,7 +331,7 @@ public: return b; } - EGLBoolean fGetConfigs(EGLDisplay dpy, EGLConfig* configs, EGLint config_size, EGLint* num_config) + EGLBoolean fGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fGetConfigs(dpy, configs, config_size, num_config); @@ -347,7 +347,7 @@ public: return b; } - EGLCastToRelevantPtr fGetProcAddress(const char* procname) + EGLCastToRelevantPtr fGetProcAddress(const char *procname) { BEFORE_GL_CALL; EGLCastToRelevantPtr p = mSymbols.fGetProcAddress(procname); @@ -384,7 +384,7 @@ public: return b; } - EGLBoolean fQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint* value) + EGLBoolean fQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fQueryContext(dpy, ctx, attribute, value); @@ -408,7 +408,7 @@ public: return b; } - EGLImage fCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint* attrib_list) + EGLImage fCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLImage i = mSymbols.fCreateImage(dpy, ctx, target, buffer, attrib_list); @@ -425,7 +425,7 @@ public: } // New extension which allow us to lock texture and get raw image pointer - EGLBoolean fLockSurface(EGLDisplay dpy, EGLSurface surface, const EGLint* attrib_list) + EGLBoolean fLockSurface(EGLDisplay dpy, EGLSurface surface, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fLockSurface(dpy, surface, attrib_list); @@ -441,7 +441,7 @@ public: return b; } - EGLBoolean fQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint* value) + EGLBoolean fQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fQuerySurface(dpy, surface, attribute, value); @@ -449,7 +449,7 @@ public: return b; } - EGLBoolean fQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void** value) + EGLBoolean fQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fQuerySurfacePointerANGLE(dpy, surface, attribute, value); @@ -457,7 +457,7 @@ public: return b; } - EGLSync fCreateSync(EGLDisplay dpy, EGLenum type, const EGLint* attrib_list) + EGLSync fCreateSync(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list) { BEFORE_GL_CALL; EGLSync ret = mSymbols.fCreateSync(dpy, type, attrib_list); @@ -481,7 +481,7 @@ public: return ret; } - EGLBoolean fGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint* value) + EGLBoolean fGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint *value) { BEFORE_GL_CALL; EGLBoolean b = mSymbols.fGetSyncAttrib(dpy, sync, attribute, value); @@ -541,9 +541,9 @@ public: void DumpEGLConfigs(); struct { - typedef EGLDisplay (GLAPIENTRY * pfnGetDisplay)(void* display_id); + typedef EGLDisplay (GLAPIENTRY * pfnGetDisplay)(void *display_id); pfnGetDisplay fGetDisplay; - typedef EGLDisplay(GLAPIENTRY * pfnGetPlatformDisplayEXT)(EGLenum platform, void* native_display, const EGLint* attrib_list); + typedef EGLDisplay(GLAPIENTRY * pfnGetPlatformDisplayEXT)(EGLenum platform, void *native_display, const EGLint *attrib_list); pfnGetPlatformDisplayEXT fGetPlatformDisplayEXT; typedef EGLBoolean (GLAPIENTRY * pfnTerminate)(EGLDisplay dpy); pfnTerminate fTerminate; @@ -555,31 +555,31 @@ public: pfnMakeCurrent fMakeCurrent; typedef EGLBoolean (GLAPIENTRY * pfnDestroyContext)(EGLDisplay dpy, EGLContext ctx); pfnDestroyContext fDestroyContext; - typedef EGLContext (GLAPIENTRY * pfnCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list); + typedef EGLContext (GLAPIENTRY * pfnCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); pfnCreateContext fCreateContext; typedef EGLBoolean (GLAPIENTRY * pfnDestroySurface)(EGLDisplay dpy, EGLSurface surface); pfnDestroySurface fDestroySurface; - typedef EGLSurface (GLAPIENTRY * pfnCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); pfnCreateWindowSurface fCreateWindowSurface; - typedef EGLSurface (GLAPIENTRY * pfnCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint* attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); pfnCreatePbufferSurface fCreatePbufferSurface; - typedef EGLSurface (GLAPIENTRY * pfnCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint* attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); pfnCreatePixmapSurface fCreatePixmapSurface; typedef EGLBoolean (GLAPIENTRY * pfnBindAPI)(EGLenum api); pfnBindAPI fBindAPI; - typedef EGLBoolean (GLAPIENTRY * pfnInitialize)(EGLDisplay dpy, EGLint* major, EGLint* minor); + typedef EGLBoolean (GLAPIENTRY * pfnInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor); pfnInitialize fInitialize; - typedef EGLBoolean (GLAPIENTRY * pfnChooseConfig)(EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config); + typedef EGLBoolean (GLAPIENTRY * pfnChooseConfig)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); pfnChooseConfig fChooseConfig; typedef EGLint (GLAPIENTRY * pfnGetError)(void); pfnGetError fGetError; - typedef EGLBoolean (GLAPIENTRY * pfnGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint* value); + typedef EGLBoolean (GLAPIENTRY * pfnGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); pfnGetConfigAttrib fGetConfigAttrib; - typedef EGLBoolean (GLAPIENTRY * pfnGetConfigs)(EGLDisplay dpy, EGLConfig* configs, EGLint config_size, EGLint* num_config); + typedef EGLBoolean (GLAPIENTRY * pfnGetConfigs)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); pfnGetConfigs fGetConfigs; typedef EGLBoolean (GLAPIENTRY * pfnWaitNative)(EGLint engine); pfnWaitNative fWaitNative; - typedef EGLCastToRelevantPtr (GLAPIENTRY * pfnGetProcAddress)(const char* procname); + typedef EGLCastToRelevantPtr (GLAPIENTRY * pfnGetProcAddress)(const char *procname); pfnGetProcAddress fGetProcAddress; typedef EGLBoolean (GLAPIENTRY * pfnSwapBuffers)(EGLDisplay dpy, EGLSurface surface); pfnSwapBuffers fSwapBuffers; @@ -590,35 +590,35 @@ public: pfnQueryString fQueryString; pfnQueryString fQueryStringImplementationANDROID; typedef EGLBoolean (GLAPIENTRY * pfnQueryContext)(EGLDisplay dpy, EGLContext ctx, - EGLint attribute, EGLint* value); + EGLint attribute, EGLint *value); pfnQueryContext fQueryContext; typedef EGLBoolean (GLAPIENTRY * pfnBindTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); pfnBindTexImage fBindTexImage; typedef EGLBoolean (GLAPIENTRY * pfnReleaseTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); pfnReleaseTexImage fReleaseTexImage; - typedef EGLImage (GLAPIENTRY * pfnCreateImage)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint* attrib_list); + typedef EGLImage (GLAPIENTRY * pfnCreateImage)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); pfnCreateImage fCreateImage; typedef EGLBoolean (GLAPIENTRY * pfnDestroyImage)(EGLDisplay dpy, EGLImage image); pfnDestroyImage fDestroyImage; // New extension which allow us to lock texture and get raw image pointer - typedef EGLBoolean (GLAPIENTRY * pfnLockSurface)(EGLDisplay dpy, EGLSurface surface, const EGLint* attrib_list); + typedef EGLBoolean (GLAPIENTRY * pfnLockSurface)(EGLDisplay dpy, EGLSurface surface, const EGLint *attrib_list); pfnLockSurface fLockSurface; typedef EGLBoolean (GLAPIENTRY * pfnUnlockSurface)(EGLDisplay dpy, EGLSurface surface); pfnUnlockSurface fUnlockSurface; - typedef EGLBoolean (GLAPIENTRY * pfnQuerySurface)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint* value); + typedef EGLBoolean (GLAPIENTRY * pfnQuerySurface)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); pfnQuerySurface fQuerySurface; - typedef EGLBoolean (GLAPIENTRY * pfnQuerySurfacePointerANGLE)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void** value); + typedef EGLBoolean (GLAPIENTRY * pfnQuerySurfacePointerANGLE)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value); pfnQuerySurfacePointerANGLE fQuerySurfacePointerANGLE; - typedef EGLSync (GLAPIENTRY * pfnCreateSync)(EGLDisplay dpy, EGLenum type, const EGLint* attrib_list); + typedef EGLSync (GLAPIENTRY * pfnCreateSync)(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list); pfnCreateSync fCreateSync; typedef EGLBoolean (GLAPIENTRY * pfnDestroySync)(EGLDisplay dpy, EGLSync sync); pfnDestroySync fDestroySync; typedef EGLint (GLAPIENTRY * pfnClientWaitSync)(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); pfnClientWaitSync fClientWaitSync; - typedef EGLBoolean (GLAPIENTRY * pfnGetSyncAttrib)(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint* value); + typedef EGLBoolean (GLAPIENTRY * pfnGetSyncAttrib)(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint *value); pfnGetSyncAttrib fGetSyncAttrib; typedef EGLint (GLAPIENTRY * pfnDupNativeFenceFDANDROID)(EGLDisplay dpy, EGLSync sync); pfnDupNativeFenceFDANDROID fDupNativeFenceFDANDROID; diff --git a/gfx/gl/GLLibraryLoader.cpp b/gfx/gl/GLLibraryLoader.cpp index 9ee2d9f629fd..26d759a0b3f9 100644 --- a/gfx/gl/GLLibraryLoader.cpp +++ b/gfx/gl/GLLibraryLoader.cpp @@ -10,7 +10,7 @@ namespace mozilla { namespace gl { bool -GLLibraryLoader::OpenLibrary(const char* library) +GLLibraryLoader::OpenLibrary(const char *library) { PRLibSpec lspec; lspec.type = PR_LibSpec_Pathname; @@ -24,9 +24,9 @@ GLLibraryLoader::OpenLibrary(const char* library) } bool -GLLibraryLoader::LoadSymbols(const SymLoadStruct* firstStruct, +GLLibraryLoader::LoadSymbols(const SymLoadStruct *firstStruct, bool tryplatform, - const char* prefix, + const char *prefix, bool warnOnFailure) { return LoadSymbols(mLibrary, @@ -37,8 +37,8 @@ GLLibraryLoader::LoadSymbols(const SymLoadStruct* firstStruct, } PRFuncPtr -GLLibraryLoader::LookupSymbol(PRLibrary* lib, - const char* sym, +GLLibraryLoader::LookupSymbol(PRLibrary *lib, + const char *sym, PlatformLookupFunction lookupFunction) { PRFuncPtr res = 0; @@ -55,7 +55,7 @@ GLLibraryLoader::LookupSymbol(PRLibrary* lib, // finally just try finding it in the process if (!res) { - PRLibrary* leakedLibRef; + PRLibrary *leakedLibRef; res = PR_FindFunctionSymbolAndLibrary(sym, &leakedLibRef); } @@ -63,16 +63,16 @@ GLLibraryLoader::LookupSymbol(PRLibrary* lib, } bool -GLLibraryLoader::LoadSymbols(PRLibrary* lib, - const SymLoadStruct* firstStruct, +GLLibraryLoader::LoadSymbols(PRLibrary *lib, + const SymLoadStruct *firstStruct, PlatformLookupFunction lookupFunction, - const char* prefix, + const char *prefix, bool warnOnFailure) { char sbuf[MAX_SYMBOL_LENGTH * 2]; int failCount = 0; - const SymLoadStruct* ss = firstStruct; + const SymLoadStruct *ss = firstStruct; while (ss->symPointer) { *ss->symPointer = 0; @@ -80,7 +80,7 @@ GLLibraryLoader::LoadSymbols(PRLibrary* lib, if (ss->symNames[i] == nullptr) break; - const char* s = ss->symNames[i]; + const char *s = ss->symNames[i]; if (prefix && *prefix != 0) { strcpy(sbuf, prefix); strcat(sbuf, ss->symNames[i]); diff --git a/gfx/gl/GLLibraryLoader.h b/gfx/gl/GLLibraryLoader.h index f2b39ab8e185..5893363ce3d4 100644 --- a/gfx/gl/GLLibraryLoader.h +++ b/gfx/gl/GLLibraryLoader.h @@ -21,9 +21,9 @@ namespace gl { class GLLibraryLoader { public: - bool OpenLibrary(const char* library); + bool OpenLibrary(const char *library); - typedef PRFuncPtr (GLAPIENTRY * PlatformLookupFunction) (const char*); + typedef PRFuncPtr (GLAPIENTRY * PlatformLookupFunction) (const char *); enum { MAX_SYMBOL_NAMES = 6, @@ -31,25 +31,25 @@ public: }; typedef struct { - PRFuncPtr* symPointer; - const char* symNames[MAX_SYMBOL_NAMES]; + PRFuncPtr *symPointer; + const char *symNames[MAX_SYMBOL_NAMES]; } SymLoadStruct; - bool LoadSymbols(const SymLoadStruct* firstStruct, + bool LoadSymbols(const SymLoadStruct *firstStruct, bool tryplatform = false, - const char* prefix = nullptr, + const char *prefix = nullptr, bool warnOnFailure = true); /* * Static version of the functions in this class */ - static PRFuncPtr LookupSymbol(PRLibrary* lib, - const char* symname, + static PRFuncPtr LookupSymbol(PRLibrary *lib, + const char *symname, PlatformLookupFunction lookupFunction = nullptr); - static bool LoadSymbols(PRLibrary* lib, - const SymLoadStruct* firstStruct, + static bool LoadSymbols(PRLibrary *lib, + const SymLoadStruct *firstStruct, PlatformLookupFunction lookupFunction = nullptr, - const char* prefix = nullptr, + const char *prefix = nullptr, bool warnOnFailure = true); protected: GLLibraryLoader() { @@ -57,7 +57,7 @@ protected: mLookupFunc = nullptr; } - PRLibrary* mLibrary; + PRLibrary *mLibrary; PlatformLookupFunction mLookupFunc; }; diff --git a/gfx/gl/GLScreenBuffer.h b/gfx/gl/GLScreenBuffer.h index 6cfdf3ba9d33..e3a6987d72e4 100644 --- a/gfx/gl/GLScreenBuffer.h +++ b/gfx/gl/GLScreenBuffer.h @@ -246,7 +246,7 @@ public: * otherwise. */ bool ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, GLvoid* pixels); + GLenum format, GLenum type, GLvoid *pixels); // Morph changes the factory used to create surfaces. void Morph(UniquePtr newFactory); diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp index ae8995a08351..0f6636628254 100644 --- a/gfx/gl/GLTextureImage.cpp +++ b/gfx/gl/GLTextureImage.cpp @@ -84,7 +84,7 @@ TextureImage::Create(GLContext* gl, } bool -TextureImage::UpdateFromDataSource(gfx::DataSourceSurface* aSurface, +TextureImage::UpdateFromDataSource(gfx::DataSourceSurface *aSurface, const nsIntRegion* aDestRegion, const gfx::IntPoint* aSrcPoint) { @@ -117,7 +117,7 @@ TextureImage::UpdateUploadSize(size_t amount) BasicTextureImage::~BasicTextureImage() { - GLContext* ctx = mGLContext; + GLContext *ctx = mGLContext; if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) { ctx = ctx->GetSharedContext(); } diff --git a/gfx/gl/GLTextureImage.h b/gfx/gl/GLTextureImage.h index 97355fb2d74f..875e3f3295a1 100644 --- a/gfx/gl/GLTextureImage.h +++ b/gfx/gl/GLTextureImage.h @@ -168,7 +168,7 @@ public: * aFrom - offset in the source to update from */ virtual bool DirectUpdate(gfx::DataSourceSurface* aSurf, const nsIntRegion& aRegion, const gfx::IntPoint& aFrom = gfx::IntPoint(0,0)) = 0; - bool UpdateFromDataSource(gfx::DataSourceSurface* aSurf, + bool UpdateFromDataSource(gfx::DataSourceSurface *aSurf, const nsIntRegion* aDstRegion = nullptr, const gfx::IntPoint* aSrcOffset = nullptr); diff --git a/gfx/gl/GLTypes.h b/gfx/gl/GLTypes.h index af2701986211..b155d2e12acf 100644 --- a/gfx/gl/GLTypes.h +++ b/gfx/gl/GLTypes.h @@ -74,14 +74,14 @@ typedef void* EGLImage; typedef int EGLint; typedef unsigned int EGLBoolean; typedef unsigned int EGLenum; -typedef void* EGLConfig; -typedef void* EGLContext; -typedef void* EGLDisplay; -typedef void* EGLSurface; -typedef void* EGLClientBuffer; -typedef void* EGLCastToRelevantPtr; -typedef void* EGLImage; -typedef void* EGLSync; +typedef void *EGLConfig; +typedef void *EGLContext; +typedef void *EGLDisplay; +typedef void *EGLSurface; +typedef void *EGLClientBuffer; +typedef void *EGLCastToRelevantPtr; +typedef void *EGLImage; +typedef void *EGLSync; typedef uint64_t EGLTime; #define EGL_NO_CONTEXT ((EGLContext)0) diff --git a/gfx/gl/GLUploadHelpers.cpp b/gfx/gl/GLUploadHelpers.cpp index 60a9da7fc077..b48a3d1882d9 100644 --- a/gfx/gl/GLUploadHelpers.cpp +++ b/gfx/gl/GLUploadHelpers.cpp @@ -81,8 +81,8 @@ CopyAndPadTextureData(const GLvoid* srcBuffer, GLsizei dstWidth, GLsizei dstHeight, GLsizei stride, GLint pixelsize) { - unsigned char* rowDest = static_cast(dstBuffer); - const unsigned char* source = static_cast(srcBuffer); + unsigned char *rowDest = static_cast(dstBuffer); + const unsigned char *source = static_cast(srcBuffer); for (GLsizei h = 0; h < srcHeight; ++h) { memcpy(rowDest, source, srcWidth * pixelsize); @@ -176,7 +176,7 @@ TexSubImage2DWithUnpackSubimageGLES(GLContext* gl, 1, format, type, - (const unsigned char*)pixels+(height-1)*stride); + (const unsigned char *)pixels+(height-1)*stride); gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, 4); } @@ -193,9 +193,9 @@ TexSubImage2DWithoutUnpackSubimage(GLContext* gl, // isn't supported. We make a copy of the texture data we're using, // such that we're using the whole row of data in the copy. This turns // out to be more efficient than uploading row-by-row; see bug 698197. - unsigned char* newPixels = new unsigned char[width*height*pixelsize]; - unsigned char* rowDest = newPixels; - const unsigned char* rowSource = (const unsigned char*)pixels; + unsigned char *newPixels = new unsigned char[width*height*pixelsize]; + unsigned char *rowDest = newPixels; + const unsigned char *rowSource = (const unsigned char *)pixels; for (int h = 0; h < height; h++) { memcpy(rowDest, rowSource, width*pixelsize); rowDest += width*pixelsize; @@ -220,7 +220,7 @@ TexSubImage2DWithoutUnpackSubimage(GLContext* gl, } static void -TexSubImage2DHelper(GLContext* gl, +TexSubImage2DHelper(GLContext *gl, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLsizei stride, @@ -274,11 +274,11 @@ TexSubImage2DHelper(GLContext* gl, } static void -TexImage2DHelper(GLContext* gl, +TexImage2DHelper(GLContext *gl, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei stride, GLint pixelsize, GLint border, GLenum format, - GLenum type, const GLvoid* pixels) + GLenum type, const GLvoid *pixels) { if (gl->IsGLES()) { @@ -562,7 +562,7 @@ UploadImageDataToTexture(GLContext* gl, // The inital data pointer is at the top left point of the region's // bounding rectangle. We need to find the offset of this rect // within the region and adjust the data pointer accordingly. - unsigned char* rectData = + unsigned char *rectData = aData + DataOffset(rect.TopLeft() - topLeft, aStride, aFormat); NS_ASSERTION(textureInited || (rect.x == 0 && rect.y == 0), diff --git a/gfx/gl/GLUploadHelpers.h b/gfx/gl/GLUploadHelpers.h index ebcc096f9b03..a641b453722e 100644 --- a/gfx/gl/GLUploadHelpers.h +++ b/gfx/gl/GLUploadHelpers.h @@ -71,7 +71,7 @@ UploadImageDataToTexture(GLContext* gl, */ gfx::SurfaceFormat UploadSurfaceToTexture(GLContext* gl, - gfx::DataSourceSurface* aSurface, + gfx::DataSourceSurface *aSurface, const nsIntRegion& aDstRegion, GLuint& aTexture, size_t* aOutUploadSize = nullptr, diff --git a/gfx/gl/GLXLibrary.h b/gfx/gl/GLXLibrary.h index 629c3e518b1f..687db73e8b83 100644 --- a/gfx/gl/GLXLibrary.h +++ b/gfx/gl/GLXLibrary.h @@ -11,11 +11,11 @@ typedef realGLboolean GLboolean; // stuff from glx.h #include "X11/Xlib.h" -typedef struct __GLXcontextRec* GLXContext; +typedef struct __GLXcontextRec *GLXContext; typedef XID GLXPixmap; typedef XID GLXDrawable; /* GLX 1.3 and later */ -typedef struct __GLXFBConfigRec* GLXFBConfig; +typedef struct __GLXFBConfigRec *GLXFBConfig; typedef XID GLXFBConfigID; typedef XID GLXContextID; typedef XID GLXWindow; @@ -67,59 +67,59 @@ public: {} void xDestroyContext(Display* display, GLXContext context); - Bool xMakeCurrent(Display* display, - GLXDrawable drawable, + Bool xMakeCurrent(Display* display, + GLXDrawable drawable, GLXContext context); GLXContext xGetCurrentContext(); - static void* xGetProcAddress(const char* procName); - GLXFBConfig* xChooseFBConfig(Display* display, - int screen, - const int* attrib_list, - int* nelements); - GLXFBConfig* xGetFBConfigs(Display* display, - int screen, - int* nelements); - GLXContext xCreateNewContext(Display* display, - GLXFBConfig config, - int render_type, - GLXContext share_list, + static void* xGetProcAddress(const char *procName); + GLXFBConfig* xChooseFBConfig(Display* display, + int screen, + const int *attrib_list, + int *nelements); + GLXFBConfig* xGetFBConfigs(Display* display, + int screen, + int *nelements); + GLXContext xCreateNewContext(Display* display, + GLXFBConfig config, + int render_type, + GLXContext share_list, Bool direct); - int xGetFBConfigAttrib(Display* display, + int xGetFBConfigAttrib(Display *display, GLXFBConfig config, int attribute, - int* value); - void xSwapBuffers(Display* display, GLXDrawable drawable); - const char* xQueryExtensionsString(Display* display, - int screen); - const char* xGetClientString(Display* display, - int screen); - const char* xQueryServerString(Display* display, - int screen, int name); - GLXPixmap xCreatePixmap(Display* display, + int *value); + void xSwapBuffers(Display *display, GLXDrawable drawable); + const char * xQueryExtensionsString(Display *display, + int screen); + const char * xGetClientString(Display *display, + int screen); + const char * xQueryServerString(Display *display, + int screen, int name); + GLXPixmap xCreatePixmap(Display *display, GLXFBConfig config, Pixmap pixmap, - const int* attrib_list); - GLXPixmap xCreateGLXPixmapWithConfig(Display* display, + const int *attrib_list); + GLXPixmap xCreateGLXPixmapWithConfig(Display *display, GLXFBConfig config, Pixmap pixmap); - void xDestroyPixmap(Display* display, GLXPixmap pixmap); - Bool xQueryVersion(Display* display, - int* major, - int* minor); - void xBindTexImage(Display* display, + void xDestroyPixmap(Display *display, GLXPixmap pixmap); + Bool xQueryVersion(Display *display, + int *major, + int *minor); + void xBindTexImage(Display *display, GLXDrawable drawable, int buffer, - const int* attrib_list); - void xReleaseTexImage(Display* display, + const int *attrib_list); + void xReleaseTexImage(Display *display, GLXDrawable drawable, int buffer); void xWaitGL(); void xWaitX(); - GLXContext xCreateContextAttribs(Display* display, - GLXFBConfig config, - GLXContext share_list, + GLXContext xCreateContextAttribs(Display* display, + GLXFBConfig config, + GLXContext share_list, Bool direct, const int* attrib_list); @@ -143,7 +143,7 @@ public: bool GLXVersionCheck(int aMajor, int aMinor); private: - + typedef void (GLAPIENTRY * PFNGLXDESTROYCONTEXTPROC) (Display*, GLXContext); PFNGLXDESTROYCONTEXTPROC xDestroyContextInternal; @@ -153,89 +153,89 @@ private: PFNGLXMAKECURRENTPROC xMakeCurrentInternal; typedef GLXContext (GLAPIENTRY * PFNGLXGETCURRENTCONTEXT) (); PFNGLXGETCURRENTCONTEXT xGetCurrentContextInternal; - typedef void* (GLAPIENTRY * PFNGLXGETPROCADDRESSPROC) (const char*); + typedef void* (GLAPIENTRY * PFNGLXGETPROCADDRESSPROC) (const char *); PFNGLXGETPROCADDRESSPROC xGetProcAddressInternal; - typedef GLXFBConfig* (GLAPIENTRY * PFNGLXCHOOSEFBCONFIG) (Display*, + typedef GLXFBConfig* (GLAPIENTRY * PFNGLXCHOOSEFBCONFIG) (Display *, int, - const int*, - int*); + const int *, + int *); PFNGLXCHOOSEFBCONFIG xChooseFBConfigInternal; - typedef GLXFBConfig* (GLAPIENTRY * PFNGLXGETFBCONFIGS) (Display*, + typedef GLXFBConfig* (GLAPIENTRY * PFNGLXGETFBCONFIGS) (Display *, int, - int*); + int *); PFNGLXGETFBCONFIGS xGetFBConfigsInternal; - typedef GLXContext (GLAPIENTRY * PFNGLXCREATENEWCONTEXT) (Display*, + typedef GLXContext (GLAPIENTRY * PFNGLXCREATENEWCONTEXT) (Display *, GLXFBConfig, int, GLXContext, Bool); PFNGLXCREATENEWCONTEXT xCreateNewContextInternal; - typedef int (GLAPIENTRY * PFNGLXGETFBCONFIGATTRIB) (Display*, + typedef int (GLAPIENTRY * PFNGLXGETFBCONFIGATTRIB) (Display *, GLXFBConfig, int, - int*); + int *); PFNGLXGETFBCONFIGATTRIB xGetFBConfigAttribInternal; - typedef void (GLAPIENTRY * PFNGLXSWAPBUFFERS) (Display*, + typedef void (GLAPIENTRY * PFNGLXSWAPBUFFERS) (Display *, GLXDrawable); PFNGLXSWAPBUFFERS xSwapBuffersInternal; - typedef const char* (GLAPIENTRY * PFNGLXQUERYEXTENSIONSSTRING) (Display*, - int); + typedef const char * (GLAPIENTRY * PFNGLXQUERYEXTENSIONSSTRING) (Display *, + int); PFNGLXQUERYEXTENSIONSSTRING xQueryExtensionsStringInternal; - typedef const char* (GLAPIENTRY * PFNGLXGETCLIENTSTRING) (Display*, - int); + typedef const char * (GLAPIENTRY * PFNGLXGETCLIENTSTRING) (Display *, + int); PFNGLXGETCLIENTSTRING xGetClientStringInternal; - typedef const char* (GLAPIENTRY * PFNGLXQUERYSERVERSTRING) (Display*, - int, - int); + typedef const char * (GLAPIENTRY * PFNGLXQUERYSERVERSTRING) (Display *, + int, + int); PFNGLXQUERYSERVERSTRING xQueryServerStringInternal; - typedef GLXPixmap (GLAPIENTRY * PFNGLXCREATEPIXMAP) (Display*, + typedef GLXPixmap (GLAPIENTRY * PFNGLXCREATEPIXMAP) (Display *, GLXFBConfig, Pixmap, - const int*); + const int *); PFNGLXCREATEPIXMAP xCreatePixmapInternal; typedef GLXPixmap (GLAPIENTRY * PFNGLXCREATEGLXPIXMAPWITHCONFIG) - (Display*, + (Display *, GLXFBConfig, Pixmap); PFNGLXCREATEGLXPIXMAPWITHCONFIG xCreateGLXPixmapWithConfigInternal; - typedef void (GLAPIENTRY * PFNGLXDESTROYPIXMAP) (Display*, + typedef void (GLAPIENTRY * PFNGLXDESTROYPIXMAP) (Display *, GLXPixmap); PFNGLXDESTROYPIXMAP xDestroyPixmapInternal; - typedef Bool (GLAPIENTRY * PFNGLXQUERYVERSION) (Display*, - int*, - int*); + typedef Bool (GLAPIENTRY * PFNGLXQUERYVERSION) (Display *, + int *, + int *); PFNGLXQUERYVERSION xQueryVersionInternal; - typedef void (GLAPIENTRY * PFNGLXBINDTEXIMAGE) (Display*, + typedef void (GLAPIENTRY * PFNGLXBINDTEXIMAGE) (Display *, GLXDrawable, int, - const int*); + const int *); PFNGLXBINDTEXIMAGE xBindTexImageInternal; - typedef void (GLAPIENTRY * PFNGLXRELEASETEXIMAGE) (Display*, + typedef void (GLAPIENTRY * PFNGLXRELEASETEXIMAGE) (Display *, GLXDrawable, int); PFNGLXRELEASETEXIMAGE xReleaseTexImageInternal; typedef void (GLAPIENTRY * PFNGLXWAITGL) (); PFNGLXWAITGL xWaitGLInternal; - + typedef void (GLAPIENTRY * PFNGLXWAITX) (); PFNGLXWAITGL xWaitXInternal; - typedef GLXContext (GLAPIENTRY * PFNGLXCREATECONTEXTATTRIBS) (Display*, + typedef GLXContext (GLAPIENTRY * PFNGLXCREATECONTEXTATTRIBS) (Display *, GLXFBConfig, GLXContext, Bool, - const int*); + const int *); PFNGLXCREATECONTEXTATTRIBS xCreateContextAttribsInternal; - typedef int (GLAPIENTRY * PFNGLXGETVIDEOSYNCSGI) (unsigned int* count); + typedef int (GLAPIENTRY *PFNGLXGETVIDEOSYNCSGI) (unsigned int *count); PFNGLXGETVIDEOSYNCSGI xGetVideoSyncInternal; - typedef int (GLAPIENTRY * PFNGLXWAITVIDEOSYNCSGI) (int divisor, int remainder, unsigned int* count); + typedef int (GLAPIENTRY *PFNGLXWAITVIDEOSYNCSGI) (int divisor, int remainder, unsigned int *count); PFNGLXWAITVIDEOSYNCSGI xWaitVideoSyncInternal; #ifdef DEBUG @@ -255,7 +255,7 @@ private: bool mClientIsMesa; int mGLXMajorVersion; int mGLXMinorVersion; - PRLibrary* mOGLLibrary; + PRLibrary *mOGLLibrary; }; // a global GLXLibrary instance diff --git a/gfx/gl/SharedSurfaceIO.h b/gfx/gl/SharedSurfaceIO.h index 98b56d1961ef..44d15acffce1 100644 --- a/gfx/gl/SharedSurfaceIO.h +++ b/gfx/gl/SharedSurfaceIO.h @@ -43,7 +43,7 @@ public: GLint x, GLint y, GLsizei width, GLsizei height, GLint border) override; virtual bool ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, GLvoid* pixels) override; + GLenum format, GLenum type, GLvoid *pixels) override; virtual GLuint ProdTexture() override { return mProdTex; @@ -53,7 +53,7 @@ public: return LOCAL_GL_TEXTURE_RECTANGLE_ARB; } - static SharedSurface_IOSurface* Cast(SharedSurface* surf) { + static SharedSurface_IOSurface* Cast(SharedSurface *surf) { MOZ_ASSERT(surf->mType == SharedSurfaceType::IOSurface); return static_cast(surf); } diff --git a/gfx/gl/TextureImageCGL.h b/gfx/gl/TextureImageCGL.h index 3eddeb8d29df..b4a551ae2db3 100644 --- a/gfx/gl/TextureImageCGL.h +++ b/gfx/gl/TextureImageCGL.h @@ -38,7 +38,7 @@ private: }; already_AddRefed -CreateTextureImageCGL(GLContext* gl, +CreateTextureImageCGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, GLenum aWrapMode, @@ -46,7 +46,7 @@ CreateTextureImageCGL(GLContext* gl, TextureImage::ImageFormat aImageFormat); already_AddRefed -TileGenFuncCGL(GLContext* gl, +TileGenFuncCGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, TextureImage::Flags aFlags); diff --git a/gfx/gl/TextureImageCGL.mm b/gfx/gl/TextureImageCGL.mm index a0ba9a508f0e..e7a4286e0c2b 100644 --- a/gfx/gl/TextureImageCGL.mm +++ b/gfx/gl/TextureImageCGL.mm @@ -79,7 +79,7 @@ CreateTextureImageCGL(GLContext* gl, } already_AddRefed -TileGenFuncCGL(GLContext* gl, +TileGenFuncCGL(GLContext *gl, const IntSize& aSize, TextureImage::ContentType aContentType, TextureImage::Flags aFlags) diff --git a/gfx/gl/TextureImageEGL.cpp b/gfx/gl/TextureImageEGL.cpp index 32a23bbba404..9e3da7765eae 100644 --- a/gfx/gl/TextureImageEGL.cpp +++ b/gfx/gl/TextureImageEGL.cpp @@ -310,7 +310,7 @@ TextureImageEGL::DestroyEGLSurface(void) } already_AddRefed -CreateTextureImageEGL(GLContext* gl, +CreateTextureImageEGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, GLenum aWrapMode, @@ -322,7 +322,7 @@ CreateTextureImageEGL(GLContext* gl, } already_AddRefed -TileGenFuncEGL(GLContext* gl, +TileGenFuncEGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, TextureImage::Flags aFlags, diff --git a/gfx/gl/TextureImageEGL.h b/gfx/gl/TextureImageEGL.h index 36f6c2d293a1..7495728d5bb3 100644 --- a/gfx/gl/TextureImageEGL.h +++ b/gfx/gl/TextureImageEGL.h @@ -78,7 +78,7 @@ protected: }; already_AddRefed -CreateTextureImageEGL(GLContext* gl, +CreateTextureImageEGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, GLenum aWrapMode, @@ -86,7 +86,7 @@ CreateTextureImageEGL(GLContext* gl, TextureImage::ImageFormat aImageFormat); already_AddRefed -TileGenFuncEGL(GLContext* gl, +TileGenFuncEGL(GLContext *gl, const gfx::IntSize& aSize, TextureImage::ContentType aContentType, TextureImage::Flags aFlags, diff --git a/gfx/gl/WGLLibrary.h b/gfx/gl/WGLLibrary.h index 3c261e10d965..fb8ed731408a 100644 --- a/gfx/gl/WGLLibrary.h +++ b/gfx/gl/WGLLibrary.h @@ -53,23 +53,23 @@ public: typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEPROC) (HANDLE hPbuffer, int iBuffer); PFNWGLRELEASETEXIMAGEPROC fReleaseTexImage; - typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATPROC) (HDC hdc, const int* piAttribIList, const FLOAT* pfAttribFList, UINT nMaxFormats, int* piFormats, UINT* nNumFormats); + typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); PFNWGLCHOOSEPIXELFORMATPROC fChoosePixelFormat; - typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int* piValues); + typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues); PFNWGLGETPIXELFORMATATTRIBIVPROC fGetPixelFormatAttribiv; - typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGPROC) (HDC hdc); + typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGPROC) (HDC hdc); PFNWGLGETEXTENSIONSSTRINGPROC fGetExtensionsString; - typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSPROC) (HDC hdc, HGLRC hShareContext, const int* attribList); + typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSPROC) (HDC hdc, HGLRC hShareContext, const int *attribList); PFNWGLCREATECONTEXTATTRIBSPROC fCreateContextAttribs; // WGL_NV_DX_interop: - // BOOL wglDXSetResourceShareHandleNV(void* dxObject, HANDLE shareHandle); + // BOOL wglDXSetResourceShareHandleNV(void *dxObject, HANDLE shareHandle); typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLEPROC) (void* dxObject, HANDLE shareHandle); PFNWGLDXSETRESOURCESHAREHANDLEPROC fDXSetResourceShareHandle; - // HANDLE wglDXOpenDeviceNV(void* dxDevice); + // HANDLE wglDXOpenDeviceNV(void *dxDevice); typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICEPROC) (void* dxDevice); PFNWGLDXOPENDEVICEPROC fDXOpenDevice; @@ -77,7 +77,7 @@ public: typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICEPROC) (HANDLE hDevice); PFNWGLDXCLOSEDEVICEPROC fDXCloseDevice; - // HANDLE wglDXRegisterObjectNV(HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access); + // HANDLE wglDXRegisterObjectNV(HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTPROC) (HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access); PFNWGLDXREGISTEROBJECTPROC fDXRegisterObject; @@ -89,16 +89,16 @@ public: typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSPROC) (HANDLE hObject, GLenum access); PFNWGLDXOBJECTACCESSPROC fDXObjectAccess; - // BOOL wglDXLockObjectsNV(HANDLE hDevice, GLint count, HANDLE* hObjects); + // BOOL wglDXLockObjectsNV(HANDLE hDevice, GLint count, HANDLE *hObjects); typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); PFNWGLDXLOCKOBJECTSPROC fDXLockObjects; - // BOOL wglDXUnlockObjectsNV(HANDLE hDevice, GLint count, HANDLE* hObjects); + // BOOL wglDXUnlockObjectsNV(HANDLE hDevice, GLint count, HANDLE *hObjects); typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); PFNWGLDXUNLOCKOBJECTSPROC fDXUnlockObjects; bool EnsureInitialized(); - HWND CreateDummyWindow(HDC* aWindowDC = nullptr); + HWND CreateDummyWindow(HDC *aWindowDC = nullptr); bool HasRobustness() const { return mHasRobustness; } bool HasDXInterop() const { return mHasDXInterop; } @@ -108,11 +108,11 @@ public: HDC GetWindowDC() const {return mWindowDC; } HGLRC GetWindowGLContext() const {return mWindowGLContext; } int GetWindowPixelFormat() const { return mWindowPixelFormat; } - PRLibrary* GetOGLLibrary() { return mOGLLibrary; } + PRLibrary *GetOGLLibrary() { return mOGLLibrary; } private: bool mInitialized; - PRLibrary* mOGLLibrary; + PRLibrary *mOGLLibrary; bool mHasRobustness; bool mHasDXInterop; bool mHasDXInterop2;