move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files

Review URL: http://codereview.appspot.com/5242056/



git-svn-id: http://skia.googlecode.com/svn/trunk@2474 2bbb7eff-a529-9590-31e7-b0007b416f81

5 files changed, 72 insertions, 72 deletions

diff --git a/src/utils/SkEGLContext_none.cpp b/src/gpu/SkGLContext_none.cpp
index 52ea5efe6d..921f583f54 100644
--- a/src/utils/SkEGLContext_none.cpp
+++ b/src/gpu/SkGLContext_none.cpp
@@ -5,15 +5,15 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 
-SkEGLContext::SkEGLContext()
+SkGLContext::SkGLContext()
     : fFBO(0) {
 }
 
-SkEGLContext::~SkEGLContext() {
+SkGLContext::~SkGLContext() {
 }
 
-bool SkEGLContext::init(int width, int height) {
+bool SkGLContext::init(int width, int height) {
     return false;
 }
diff --git a/src/utils/mac/SkEGLContext_mac.cpp b/src/gpu/mac/SkGLContext_mac.cpp
index bb96840089..0992be84d4 100644
--- a/src/utils/mac/SkEGLContext_mac.cpp
+++ b/src/gpu/mac/SkGLContext_mac.cpp
@@ -5,22 +5,22 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 //#include "SkTypes.h"
 #include <AGL/agl.h>
 
-SkEGLContext::SkEGLContext() 
+SkGLContext::SkGLContext() 
     : fFBO(0)
     , context(NULL) {
 }
 
-SkEGLContext::~SkEGLContext() {
+SkGLContext::~SkGLContext() {
     if (this->context) {
         aglDestroyContext(this->context);
     }
 }
 
-bool SkEGLContext::init(int width, int height) {
+bool SkGLContext::init(int width, int height) {
     GLint major, minor;
     AGLContext ctx;
 
diff --git a/src/utils/mesa/SkEGLContext_Mesa.cpp b/src/gpu/mesa/SkGLContext_mesa.cpp
index 1174dedbcc..6ba42e749d 100644
--- a/src/utils/mesa/SkEGLContext_Mesa.cpp
+++ b/src/gpu/mesa/SkGLContext_mesa.cpp
@@ -5,7 +5,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 #include "SkTypes.h"
 
 #include "GL/osmesa.h"
@@ -15,13 +15,13 @@
 #define SK_GL_GET_PROC(T, F) F ## _func = (T)OSMesaGetProcAddress(#F);
 #define SK_GL_GET_EXT_PROC(T, F) F ## _func = (T)OSMesaGetProcAddress(#F "EXT");
 
-SkEGLContext::SkEGLContext()
+SkGLContext::SkGLContext()
     : fFBO(0)
     , context(NULL)
     , image(NULL) {
 }
 
-SkEGLContext::~SkEGLContext() {
+SkGLContext::~SkGLContext() {
     if (this->image)
         free(this->image);
     
@@ -46,7 +46,7 @@ SkEGLContext::~SkEGLContext() {
     #define SK_OSMESA_COLOR_ORDER OSMESA_RGBA
 #endif
 
-bool SkEGLContext::init(const int width, const int height) {
+bool SkGLContext::init(const int width, const int height) {
     /* Create an RGBA-mode context */
 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
     /* specify Z, stencil, accum sizes */
diff --git a/src/utils/unix/SkEGLContext_Unix.cpp b/src/gpu/unix/SkGLContext_unix.cpp
index 40a1b5d366..ea15a4b0e2 100644
--- a/src/utils/unix/SkEGLContext_Unix.cpp
+++ b/src/gpu/unix/SkGLContext_unix.cpp
@@ -5,7 +5,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 #include "SkTypes.h"
 
 #include <GL/gl.h>
@@ -23,7 +23,7 @@ static int ctxErrorHandler(Display *dpy, XErrorEvent *ev) {
     return 0;
 }
 
-SkEGLContext::SkEGLContext() 
+SkGLContext::SkGLContext() 
     : fFBO(0)
     , context(NULL)
     , display(NULL)
@@ -31,7 +31,7 @@ SkEGLContext::SkEGLContext()
     , glxPixmap(0) {
 }
 
-SkEGLContext::~SkEGLContext() {
+SkGLContext::~SkGLContext() {
     if (this->display) {
         glXMakeCurrent(this->display, 0, 0);
 
@@ -48,7 +48,7 @@ SkEGLContext::~SkEGLContext() {
     }
 }
 
-bool SkEGLContext::init(const int width, const int height) {
+bool SkGLContext::init(const int width, const int height) {
     Display *display = XOpenDisplay(0);
     this->display = display;
 
diff --git a/src/utils/win/SkEGLContext_Win.cpp b/src/gpu/win/SkGLContext_win.cpp
index b82e7d7ff6..dc24af33ef 100644
--- a/src/utils/win/SkEGLContext_Win.cpp
+++ b/src/gpu/win/SkGLContext_win.cpp
@@ -9,39 +9,39 @@
 #include <Windows.h>
 #include <GL/GL.h>
 
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 #include "SkTypes.h"
 
-#define SK_EGL_DECLARE_PROC(F) SkEGL ## F ## Proc SkEGL ## F = NULL;
-#define SK_EGL_GET_PROC(F) SkEGL ## F = (SkEGL ## F ## Proc) \
+#define SK_GL_DECLARE_PROC(F) SkGL ## F ## Proc SkGL ## F = NULL;
+#define SK_GL_GET_PROC(F) SkGL ## F = (SkGL ## F ## Proc) \
         wglGetProcAddress("gl" #F);
-#define SK_EGL_GET_PROC_SUFFIX(F, S) SkEGL ## F = (SkEGL ## F ## Proc) \
+#define SK_GL_GET_PROC_SUFFIX(F, S) SkGL ## F = (SkGL ## F ## Proc) \
         wglGetProcAddress("gl" #F #S);
 
-#define SK_EGL_FRAMEBUFFER 0x8D40
-#define SK_EGL_RENDERBUFFER 0x8D41
-#define SK_EGL_COLOR_ATTACHMENT0 0x8CE0
-#define SK_EGL_DEPTH_STENCIL 0x84F9
-#define SK_EGL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#define SK_EGL_FRAMEBUFFER_COMPLETE 0x8CD5
-
-#define SK_EGL_FUNCTION_TYPE __stdcall
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLGenFramebuffersProc) (GLsizei n, GLuint *framebuffers);
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLBindFramebufferProc) (GLenum target, GLuint framebuffer);
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLGenRenderbuffersProc) (GLsizei n, GLuint *renderbuffers);
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLBindRenderbufferProc) (GLenum target, GLuint renderbuffer);
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLRenderbufferStorageProc) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (SK_EGL_FUNCTION_TYPE *SkEGLFramebufferRenderbufferProc) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef GLenum (SK_EGL_FUNCTION_TYPE *SkEGLCheckFramebufferStatusProc) (GLenum target);
-
-SkEGLContext::SkEGLContext()
+#define SK_GL_FRAMEBUFFER 0x8D40
+#define SK_GL_RENDERBUFFER 0x8D41
+#define SK_GL_COLOR_ATTACHMENT0 0x8CE0
+#define SK_GL_DEPTH_STENCIL 0x84F9
+#define SK_GL_DEPTH_STENCIL_ATTACHMENT 0x821A
+#define SK_GL_FRAMEBUFFER_COMPLETE 0x8CD5
+
+#define SK_GL_FUNCTION_TYPE __stdcall
+typedef void (SK_GL_FUNCTION_TYPE *SkGLGenFramebuffersProc) (GLsizei n, GLuint *framebuffers);
+typedef void (SK_GL_FUNCTION_TYPE *SkGLBindFramebufferProc) (GLenum target, GLuint framebuffer);
+typedef void (SK_GL_FUNCTION_TYPE *SkGLGenRenderbuffersProc) (GLsizei n, GLuint *renderbuffers);
+typedef void (SK_GL_FUNCTION_TYPE *SkGLBindRenderbufferProc) (GLenum target, GLuint renderbuffer);
+typedef void (SK_GL_FUNCTION_TYPE *SkGLRenderbufferStorageProc) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (SK_GL_FUNCTION_TYPE *SkGLFramebufferRenderbufferProc) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef GLenum (SK_GL_FUNCTION_TYPE *SkGLCheckFramebufferStatusProc) (GLenum target);
+
+SkGLContext::SkGLContext()
         : fFBO(0)
         , fWindow(NULL)
         , fDeviceContext(NULL)
         , fGlRenderContext(0) {
 }
 
-SkEGLContext::~SkEGLContext() {
+SkGLContext::~SkGLContext() {
     if (this->fGlRenderContext) {
         wglDeleteContext(this->fGlRenderContext);
     }
@@ -53,7 +53,7 @@ SkEGLContext::~SkEGLContext() {
     }
 }
 
-bool skEGLCheckExtension(const char* ext,
+bool skGLCheckExtension(const char* ext,
                          const char* extensionString) {
     int extLength = strlen(ext);
 
@@ -71,7 +71,7 @@ bool skEGLCheckExtension(const char* ext,
     return false;
 }
 
-bool SkEGLContext::init(const int width, const int height) {
+bool SkGLContext::init(const int width, const int height) {
     HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
 
     WNDCLASS wc;
@@ -152,51 +152,51 @@ bool SkEGLContext::init(const int width, const int height) {
     //Setup the framebuffers
     const char* glExts =
         reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
-    if (!skEGLCheckExtension(
+    if (!skGLCheckExtension(
           "GL_EXT_framebuffer_object"
           , glExts))
     {
         SkDebugf("GL_EXT_framebuffer_object not found.\n");
         return false;
     }
-    SK_EGL_DECLARE_PROC(GenFramebuffers)
-    SK_EGL_DECLARE_PROC(BindFramebuffer)
-    SK_EGL_DECLARE_PROC(GenRenderbuffers)
-    SK_EGL_DECLARE_PROC(BindRenderbuffer)
-    SK_EGL_DECLARE_PROC(RenderbufferStorage)
-    SK_EGL_DECLARE_PROC(FramebufferRenderbuffer)
-    SK_EGL_DECLARE_PROC(CheckFramebufferStatus)
-
-    SK_EGL_GET_PROC_SUFFIX(GenFramebuffers, EXT)
-    SK_EGL_GET_PROC_SUFFIX(BindFramebuffer, EXT)
-    SK_EGL_GET_PROC_SUFFIX(GenRenderbuffers, EXT)
-    SK_EGL_GET_PROC_SUFFIX(BindRenderbuffer, EXT)
-    SK_EGL_GET_PROC_SUFFIX(RenderbufferStorage, EXT)
-    SK_EGL_GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT)
-    SK_EGL_GET_PROC_SUFFIX(CheckFramebufferStatus, EXT)
+    SK_GL_DECLARE_PROC(GenFramebuffers)
+    SK_GL_DECLARE_PROC(BindFramebuffer)
+    SK_GL_DECLARE_PROC(GenRenderbuffers)
+    SK_GL_DECLARE_PROC(BindRenderbuffer)
+    SK_GL_DECLARE_PROC(RenderbufferStorage)
+    SK_GL_DECLARE_PROC(FramebufferRenderbuffer)
+    SK_GL_DECLARE_PROC(CheckFramebufferStatus)
+
+    SK_GL_GET_PROC_SUFFIX(GenFramebuffers, EXT)
+    SK_GL_GET_PROC_SUFFIX(BindFramebuffer, EXT)
+    SK_GL_GET_PROC_SUFFIX(GenRenderbuffers, EXT)
+    SK_GL_GET_PROC_SUFFIX(BindRenderbuffer, EXT)
+    SK_GL_GET_PROC_SUFFIX(RenderbufferStorage, EXT)
+    SK_GL_GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT)
+    SK_GL_GET_PROC_SUFFIX(CheckFramebufferStatus, EXT)
 
     GLuint cbID;
     GLuint dsID;
-    SkEGLGenFramebuffers(1, &fFBO);
-    SkEGLBindFramebuffer(SK_EGL_FRAMEBUFFER, fFBO);
-    SkEGLGenRenderbuffers(1, &cbID);
-    SkEGLBindRenderbuffer(SK_EGL_RENDERBUFFER, cbID);
-    SkEGLRenderbufferStorage(SK_EGL_RENDERBUFFER, GL_RGBA, width, height);
-    SkEGLFramebufferRenderbuffer(SK_EGL_FRAMEBUFFER
-                                 , SK_EGL_COLOR_ATTACHMENT0
-                                 , SK_EGL_RENDERBUFFER, cbID);
-    SkEGLGenRenderbuffers(1, &dsID);
-    SkEGLBindRenderbuffer(SK_EGL_RENDERBUFFER, dsID);
-    SkEGLRenderbufferStorage(SK_EGL_RENDERBUFFER, SK_EGL_DEPTH_STENCIL
+    SkGLGenFramebuffers(1, &fFBO);
+    SkGLBindFramebuffer(SK_GL_FRAMEBUFFER, fFBO);
+    SkGLGenRenderbuffers(1, &cbID);
+    SkGLBindRenderbuffer(SK_GL_RENDERBUFFER, cbID);
+    SkGLRenderbufferStorage(SK_GL_RENDERBUFFER, GL_RGBA, width, height);
+    SkGLFramebufferRenderbuffer(SK_GL_FRAMEBUFFER
+                                , SK_GL_COLOR_ATTACHMENT0
+                                , SK_GL_RENDERBUFFER, cbID);
+    SkGLGenRenderbuffers(1, &dsID);
+    SkGLBindRenderbuffer(SK_GL_RENDERBUFFER, dsID);
+    SkGLRenderbufferStorage(SK_GL_RENDERBUFFER, SK_GL_DEPTH_STENCIL
                              , width, height);
-    SkEGLFramebufferRenderbuffer(SK_EGL_FRAMEBUFFER
-                                 , SK_EGL_DEPTH_STENCIL_ATTACHMENT
-                                 , SK_EGL_RENDERBUFFER
+    SkGLFramebufferRenderbuffer(SK_GL_FRAMEBUFFER
+                                 , SK_GL_DEPTH_STENCIL_ATTACHMENT
+                                 , SK_GL_RENDERBUFFER
                                  , dsID);
     glViewport(0, 0, width, height);
     glClearStencil(0);
     glClear(GL_STENCIL_BUFFER_BIT);
 
-    GLenum status = SkEGLCheckFramebufferStatus(SK_EGL_FRAMEBUFFER);
-    return SK_EGL_FRAMEBUFFER_COMPLETE == status;
+    GLenum status = SkGLCheckFramebufferStatus(SK_GL_FRAMEBUFFER);
+    return SK_GL_FRAMEBUFFER_COMPLETE == status;
 }