Title: [118777] trunk/Tools
Revision
118777
Author
[email protected]
Date
2012-05-29 07:56:43 -0700 (Tue, 29 May 2012)

Log Message

[BlackBerry] OpenGL content is not rendered on simulator
https://bugs.webkit.org/show_bug.cgi?id=87721

Patch by Arvid Nilsson <[email protected]> on 2012-05-29
Reviewed by George Staikos.

Fixed by enabling GLES2 support in simulator builds.

To experiment with building without OpenGL support, you can set the
DISABLE_GLES2 environment variable to a non-empty string and rebuild.

PR #150695

* Scripts/webkitdirs.pm:
(blackberryCMakeArguments):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (118776 => 118777)


--- trunk/Tools/ChangeLog	2012-05-29 14:53:14 UTC (rev 118776)
+++ trunk/Tools/ChangeLog	2012-05-29 14:56:43 UTC (rev 118777)
@@ -1,3 +1,22 @@
+2012-05-29  Arvid Nilsson  <[email protected]>
+
+        2012-05-29  Arvid Nilsson  <[email protected]>
+
+        [BlackBerry] OpenGL content is not rendered on simulator
+        https://bugs.webkit.org/show_bug.cgi?id=87721
+
+        Reviewed by George Staikos.
+
+        Fixed by enabling GLES2 support in simulator builds.
+
+        To experiment with building without OpenGL support, you can set the
+        DISABLE_GLES2 environment variable to a non-empty string and rebuild.
+
+        PR #150695
+
+        * Scripts/webkitdirs.pm:
+        (blackberryCMakeArguments):
+
 2012-05-29  David Barr  <[email protected]>
 
         Introduce ENABLE_CSS_IMAGE_RESOLUTION compile flag

Modified: trunk/Tools/Scripts/webkitdirs.pm (118776 => 118777)


--- trunk/Tools/Scripts/webkitdirs.pm	2012-05-29 14:53:14 UTC (rev 118776)
+++ trunk/Tools/Scripts/webkitdirs.pm	2012-05-29 14:56:43 UTC (rev 118777)
@@ -939,7 +939,6 @@
     if ($cpu eq "a9") {
         $cpu = $arch . "v7le";
         push @cmakeExtraOptions, '-DTARGETING_PLAYBOOK=1';
-        push @cmakeExtraOptions, '-DENABLE_GLES2=1';
     }
 
     my $stageDir = $ENV{"STAGE_DIR"};
@@ -966,7 +965,7 @@
 
     push @cmakeExtraOptions, "-DCMAKE_SKIP_RPATH='ON'" if isDarwin();
     push @cmakeExtraOptions, "-DENABLE_DRT=1" if $ENV{"ENABLE_DRT"};
-    push @cmakeExtraOptions, "-DENABLE_GLES2=1" if $ENV{"ENABLE_GLES2"};
+    push @cmakeExtraOptions, "-DENABLE_GLES2=1" unless $ENV{"DISABLE_GLES2"};
 
     my @includeSystemDirectories;
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "grskia", "skia");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to