Bug 1229152. Expose unsized GL_FLOAT formats required by GL_OES_texture_float
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Thu, 03 Dec 2015 16:39:50 -0500
changeset 275487 92f7aa9524606fb1543163e110489e4263fca6d8
parent 275486 bcd90e59103812be30b73d465b5eeef26ed1d4a4
child 275488 1602b93dcc413caa7ac8af1a2ca8d3812c6b33b9
push id68862
push userjmuizelaar@mozilla.com
push dateThu, 03 Dec 2015 21:41:18 +0000
treeherdermozilla-inbound@92f7aa952460 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1229152
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1229152. Expose unsized GL_FLOAT formats required by GL_OES_texture_float BUG=angleproject:1209
gfx/angle/src/commit.h
gfx/angle/src/libANGLE/validationES3.cpp
--- a/gfx/angle/src/commit.h
+++ b/gfx/angle/src/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "2eb89424cc6d"
+#define ANGLE_COMMIT_HASH "316930d51ea9"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2015-11-28 17:17:38 -0500"
+#define ANGLE_COMMIT_DATE "2015-12-03 16:34:05 -0500"
--- a/gfx/angle/src/libANGLE/validationES3.cpp
+++ b/gfx/angle/src/libANGLE/validationES3.cpp
@@ -149,16 +149,18 @@ ES3FormatCombinationSet BuildES3FormatSe
     InsertES3FormatCombo(&set, GL_DEPTH24_STENCIL8,   GL_DEPTH_STENCIL,   GL_UNSIGNED_INT_24_8             );
     InsertES3FormatCombo(&set, GL_DEPTH32F_STENCIL8,  GL_DEPTH_STENCIL,   GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
 
     // From GL_EXT_sRGB
     InsertES3FormatCombo(&set, GL_SRGB8_ALPHA8_EXT,   GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE                  );
     InsertES3FormatCombo(&set, GL_SRGB8,              GL_SRGB_EXT,       GL_UNSIGNED_BYTE                  );
 
     // From GL_OES_texture_float
+    InsertES3FormatCombo(&set, GL_RGBA,               GL_RGBA,            GL_FLOAT                         );
+    InsertES3FormatCombo(&set, GL_RGB,                GL_RGB,             GL_FLOAT                         );
     InsertES3FormatCombo(&set, GL_LUMINANCE_ALPHA,    GL_LUMINANCE_ALPHA, GL_FLOAT                         );
     InsertES3FormatCombo(&set, GL_LUMINANCE,          GL_LUMINANCE,       GL_FLOAT                         );
     InsertES3FormatCombo(&set, GL_ALPHA,              GL_ALPHA,           GL_FLOAT                         );
 
     // From GL_OES_texture_half_float
     InsertES3FormatCombo(&set, GL_LUMINANCE_ALPHA,    GL_LUMINANCE_ALPHA, GL_HALF_FLOAT                    );
     InsertES3FormatCombo(&set, GL_LUMINANCE_ALPHA,    GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES                );
     InsertES3FormatCombo(&set, GL_LUMINANCE,          GL_LUMINANCE,       GL_HALF_FLOAT                    );