Attachment 120923 Details for Bug 75466 – Patch

[patch] Patch

bug-75466-20120103194428.patch (text/plain), 5.28 KB, created by ChangSeok Oh on 2012-01-03 02:44:29 PST

(hide)

Description:

Filename:

MIME Type:

Creator: ChangSeok Oh

Created: 2012-01-03 02:44:29 PST

Size: 5.28 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 103931)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2012-01-03  ChangSeok Oh  <shivamidow@gmail.com>
>+
>+        Remove style warning in GraphicsContext3DOpenGL.cpp
>+        https://bugs.webkit.org/show_bug.cgi?id=75466
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Relocated some headers according to alphabetical order & modified indentation.
>+
>+        No new tests required.
>+
>+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
>+        (WebCore::GraphicsContext3D::releaseShaderCompiler):
>+        (WebCore::GraphicsContext3D::getShaderiv):
>+        (WebCore::GraphicsContext3D::getShaderInfoLog):
>+
> 2012-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect()
>Index: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp	(revision 103926)
>+++ Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp	(working copy)
>@@ -25,15 +25,10 @@
> 
> #include "config.h"
> 
>-#if PLATFORM(QT)
>-#include <QtGlobal>
>-#endif
>-
> #if ENABLE(WEBGL)
> 
> #include "GraphicsContext3D.h"
> 
>-#include "WebGLObject.h"
> #include "CanvasRenderingContext.h"
> #include "Extensions3DOpenGL.h"
> #include "GraphicsContext.h"
>@@ -41,6 +36,7 @@
> #include "ImageBuffer.h"
> #include "ImageData.h"
> #include "NotImplemented.h"
>+#include "WebGLObject.h"
> #include <cstring>
> #include <wtf/ArrayBuffer.h>
> #include <wtf/ArrayBufferView.h>
>@@ -55,6 +51,7 @@
> #elif PLATFORM(GTK)
> #include "OpenGLShims.h"
> #elif PLATFORM(QT)
>+#include <QtGlobal>
> #include <cairo/OpenGLShims.h>
> #endif
> 
>@@ -889,7 +886,7 @@ void GraphicsContext3D::releaseShaderCom
> {
>     // FIXME: This is not implemented on desktop OpenGL. We need to have ifdefs for the different GL variants
>     makeContextCurrent();
>-    //::glReleaseShaderCompiler();
>+    // ::glReleaseShaderCompiler();
> }
> 
> void GraphicsContext3D::renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height)
>@@ -1274,37 +1271,30 @@ void GraphicsContext3D::getShaderiv(Plat
>     HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
>     
>     switch (pname) {
>-        case DELETE_STATUS:
>-        case SHADER_TYPE:
>-            // Let OpenGL handle these.
>-        
>-            ::glGetShaderiv(shader, pname, value);
>-            break;
>-        
>-        case COMPILE_STATUS:
>-            if (result == m_shaderSourceMap.end()) {
>-                (*value) = static_cast<int>(false);
>-                return;
>-            }
>-        
>-            (*value) = static_cast<int>(result->second.isValid);
>-            break;
>-        
>-        case INFO_LOG_LENGTH:
>-            if (result == m_shaderSourceMap.end()) {
>-                (*value) = 0;
>-                return;
>-            }
>-        
>-            (*value) = getShaderInfoLog(shader).length();
>-            break;
>-        
>-        case SHADER_SOURCE_LENGTH:
>-            (*value) = getShaderSource(shader).length();
>-            break;
>-        
>-        default:
>-            synthesizeGLError(INVALID_ENUM);
>+    case DELETE_STATUS:
>+    case SHADER_TYPE:
>+        // Let OpenGL handle these.
>+        ::glGetShaderiv(shader, pname, value);
>+        break;
>+    case COMPILE_STATUS:
>+        if (result == m_shaderSourceMap.end()) {
>+            (*value) = static_cast<int>(false);
>+            return;
>+        }
>+        (*value) = static_cast<int>(result->second.isValid);
>+        break;
>+    case INFO_LOG_LENGTH:
>+        if (result == m_shaderSourceMap.end()) {
>+            (*value) = 0;
>+            return;
>+        }
>+        (*value) = getShaderInfoLog(shader).length();
>+        break;
>+    case SHADER_SOURCE_LENGTH:
>+        (*value) = getShaderSource(shader).length();
>+        break;
>+    default:
>+        synthesizeGLError(INVALID_ENUM);
>     }
> }
> 
>@@ -1317,26 +1307,27 @@ String GraphicsContext3D::getShaderInfoL
>     HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
> 
>     if (result == m_shaderSourceMap.end())
>-         return "";
>+        return "";
>+
>+    ShaderSourceEntry entry = result->second;
> 
>-     ShaderSourceEntry entry = result->second;
>+    if (entry.isValid) {
>+        GLint length;
>+        ::glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
>+        if (!length)
>+            return "";
>+
>+        GLsizei size;
>+        GLchar* info = (GLchar*) fastMalloc(length);
>+
>+        ::glGetShaderInfoLog(shader, length, &size, info);
>+
>+        String s(info);
>+        fastFree(info);
>+        return s;
>+    }
> 
>-     if (entry.isValid) {
>-         GLint length;
>-         ::glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
>-         if (!length)
>-             return "";
>-
>-         GLsizei size;
>-         GLchar* info = (GLchar*) fastMalloc(length);
>-
>-         ::glGetShaderInfoLog(shader, length, &size, info);
>-
>-         String s(info);
>-         fastFree(info);
>-         return s;
>-     } else
>-         return entry.log;
>+    return entry.log;
> }
> 
> String GraphicsContext3D::getShaderSource(Platform3DObject shader)

Flags:

dbates: review-
dbates: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 75466: 120923 | 121076