Bug 629971 - fix non-libXUL build: had damaged and not properly applied angle-shared.patch - r+a=bustage-of-non-libxul-build
authorBenoit Jacob <bjacob@mozilla.com>
Sat, 29 Jan 2011 23:43:11 -0500
changeset 61616 28bef0ccd9278beb0e136c0f9bc6f66f38a72209
parent 61615 7dc2ef0666bcd942ac118d2ed82bc5de0b220114
child 61617 b7ca6147425eb75cfff026e1abe8f5446d3688e0
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs629971
milestone2.0b11pre
Bug 629971 - fix non-libXUL build: had damaged and not properly applied angle-shared.patch - r+a=bustage-of-non-libxul-build
gfx/angle/angle-shared.patch
gfx/angle/include/GLSLANG/ShaderLang.h
--- a/gfx/angle/angle-shared.patch
+++ b/gfx/angle/angle-shared.patch
@@ -1,10 +1,11 @@
 # HG changeset patch
-# Parent 0f2a334e5049bffe457bd31d3d8f5550af7ba299
+# Parent 438b6d09a9fac42fd66235e626a09a0ea4e88b61
+
 diff --git a/gfx/angle/include/GLSLANG/ShaderLang.h b/gfx/angle/include/GLSLANG/ShaderLang.h
 --- a/gfx/angle/include/GLSLANG/ShaderLang.h
 +++ b/gfx/angle/include/GLSLANG/ShaderLang.h
 @@ -1,16 +1,36 @@
  //
  // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -35,16 +36,41 @@ diff --git a/gfx/angle/include/GLSLANG/S
  //
  // This is the platform independent interface between an OGL driver
  // and the shading language compiler.
  //
  
  #ifdef __cplusplus
  extern "C" {
  #endif
+@@ -76,22 +96,22 @@ typedef enum {
+   SH_SOURCE_PATH            = 0x0200,
+ } ShCompileOptions;
+ 
+ //
+ // Driver must call this first, once, before doing any other
+ // compiler operations.
+ // If the function succeeds, the return value is nonzero, else zero.
+ //
+-int ShInitialize();
++ANGLE_API int ShInitialize();
+ //
+ // Driver should call this at shutdown.
+ // If the function succeeds, the return value is nonzero, else zero.
+ //
+-int ShFinalize();
++ANGLE_API int ShFinalize();
+ 
+ //
+ // Implementation dependent built-in resources (constants and extensions).
+ // The names for these resources has been obtained by stripping gl_/GL_.
+ //
+ typedef struct
+ {
+     // Constants.
 @@ -107,17 +127,17 @@ typedef struct
      // Extensions.
      // Set to 1 to enable the extension, else 0.
      int OES_standard_derivatives;
  } ShBuiltInResources;
  
  //
  // Initialize built-in resources with minimum expected values.
--- a/gfx/angle/include/GLSLANG/ShaderLang.h
+++ b/gfx/angle/include/GLSLANG/ShaderLang.h
@@ -96,22 +96,22 @@ typedef enum {
   SH_SOURCE_PATH            = 0x0200,
 } ShCompileOptions;
 
 //
 // Driver must call this first, once, before doing any other
 // compiler operations.
 // If the function succeeds, the return value is nonzero, else zero.
 //
-int ShInitialize();
+ANGLE_API int ShInitialize();
 //
 // Driver should call this at shutdown.
 // If the function succeeds, the return value is nonzero, else zero.
 //
-int ShFinalize();
+ANGLE_API int ShFinalize();
 
 //
 // Implementation dependent built-in resources (constants and extensions).
 // The names for these resources has been obtained by stripping gl_/GL_.
 //
 typedef struct
 {
     // Constants.