Changeset 128760 in webkit

Timestamp:

Sep 17, 2012 8:06:10 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Use glDeleteProgram to delete OpenGL shader programs.
​https://bugs.webkit.org/show_bug.cgi?id=96771

Patch by Filip Spacek <​fspacek@rim.com> on 2012-09-17
Reviewed by Rob Buis.

Reviewed internally by Arvid Nilsson.

• platform/graphics/blackberry/EGLImageLayerWebKitThread.cpp:

(WebCore::EGLImageLayerWebKitThread::EGLImageLayerWebKitThread):
(WebCore::EGLImageLayerWebKitThread::~EGLImageLayerWebKitThread):
(WebCore::EGLImageLayerWebKitThread::deleteFrontBuffer):
(WebCore::EGLImageLayerWebKitThread::createShaderIfNeeded):
(WebCore::EGLImageLayerWebKitThread::blitToFrontBuffer):

• platform/graphics/blackberry/EGLImageLayerWebKitThread.h:

(EGLImageLayerWebKitThread):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/EGLImageLayerWebKitThread.cpp (modified) (5 diffs)
• platform/graphics/blackberry/EGLImageLayerWebKitThread.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-17  Filip Spacek  <fspacek@rim.com>
+
+        [BlackBerry] Use glDeleteProgram to delete OpenGL shader programs.
+        https://bugs.webkit.org/show_bug.cgi?id=96771
+
+        Reviewed by Rob Buis.
+
+        Reviewed internally by Arvid Nilsson.
+
+        * platform/graphics/blackberry/EGLImageLayerWebKitThread.cpp:
+        (WebCore::EGLImageLayerWebKitThread::EGLImageLayerWebKitThread):
+        (WebCore::EGLImageLayerWebKitThread::~EGLImageLayerWebKitThread):
+        (WebCore::EGLImageLayerWebKitThread::deleteFrontBuffer):
+        (WebCore::EGLImageLayerWebKitThread::createShaderIfNeeded):
+        (WebCore::EGLImageLayerWebKitThread::blitToFrontBuffer):
+        * platform/graphics/blackberry/EGLImageLayerWebKitThread.h:
+        (EGLImageLayerWebKitThread):
+
 2012-09-17  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/platform/graphics/blackberry/EGLImageLayerWebKitThread.cpp

@@ -46 +46 @@
     , m_frontBufferTexture(0)
     , m_fbo(0)
-    , m_shader(0)
+    , m_program(0)
     , m_image(0)
 {
@@ -59 +59 @@
     ASSERT(!m_frontBufferTexture);
     ASSERT(!m_fbo);
-    ASSERT(!m_shader);
+    ASSERT(!m_program);
     ASSERT(!m_image);
 }
@@ -124 +124 @@
     glDeleteFramebuffers(1, &m_fbo);
     m_fbo = 0;
-    glDeleteShader(m_shader);
-    m_shader = 0;
+    glDeleteProgram(m_program);
+    m_program = 0;
 
     // The image is in our EGLImageLayerCompositingThreadClient's custody
@@ -217 +217 @@
         "}                                                  \n";
 
-    if (!m_shader) {
-        m_shader = LayerRenderer::loadShaderProgram(vertexShaderString, fragmentShaderStringRGBA);
-        if (!m_shader)
+    if (!m_program) {
+        m_program = LayerRenderer::loadShaderProgram(vertexShaderString, fragmentShaderStringRGBA);
+        if (!m_program)
             return;
-        glBindAttribLocation(m_shader, GLES2Program::PositionAttributeIndex, "a_position");
-        glBindAttribLocation(m_shader, GLES2Program::TexCoordAttributeIndex, "a_texCoord");
-        glLinkProgram(m_shader);
-        unsigned samplerLocation = glGetUniformLocation(m_shader, "s_texture");
-        glUseProgram(m_shader);
+        glBindAttribLocation(m_program, GLES2Program::PositionAttributeIndex, "a_position");
+        glBindAttribLocation(m_program, GLES2Program::TexCoordAttributeIndex, "a_texCoord");
+        glLinkProgram(m_program);
+        unsigned samplerLocation = glGetUniformLocation(m_program, "s_texture");
+        glUseProgram(m_program);
         glUniform1i(samplerLocation, 0);
     }
@@ -256 +256 @@
     glViewport(0, 0, m_size.width(), m_size.height());
     glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
-    glUseProgram(m_shader);
+    glUseProgram(m_program);
     glBindTexture(GL_TEXTURE_2D, backBufferTexture);
     glColorMask(true, true, true, true);

trunk/Source/WebCore/platform/graphics/blackberry/EGLImageLayerWebKitThread.h

@@ -57 +57 @@
     unsigned m_frontBufferTexture;
     unsigned m_fbo;
-    unsigned m_shader;
+    unsigned m_program;
     void* m_image;
     Vector<void*> m_garbage;