mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backed out changeset 46d18be48bc4 (bug 981856) for b2g gl bustages
* * * Backed out changeset a2ec4ab256e8 (bug 981856)
This commit is contained in:
parent
4a88e35e6f
commit
6c8846b330
@ -118,8 +118,7 @@ void main(void) {
|
||||
var elemTestFunc = todo; // We fail on most implementations.
|
||||
var checkGLTestFunc = todo;
|
||||
if (DriverInfo.getDriver() == DriverInfo.DRIVER.ANGLE ||
|
||||
DriverInfo.getOS() == DriverInfo.OS.ANDROID ||
|
||||
DriverInfo.getOS() == DriverInfo.OS.B2G)
|
||||
DriverInfo.getOS() == DriverInfo.OS.ANDROID)
|
||||
{
|
||||
// ANGLE and Android slaves seem to work fine.
|
||||
elemTestFunc = ok;
|
||||
|
@ -27,6 +27,12 @@ function test() {
|
||||
shouldFail = false;
|
||||
}
|
||||
|
||||
if (DriverInfo.getOS() == DriverInfo.OS.B2G) {
|
||||
// We don't run these mochitests on hardware with WebGL-capable hardware yet.
|
||||
shouldSucceed = false;
|
||||
shouldFail = true;
|
||||
}
|
||||
|
||||
var gl = WebGLUtil.getWebGL('c');
|
||||
if (shouldSucceed) {
|
||||
ok(gl, 'Expected WebGL creation to succeed.');
|
||||
|
@ -11,6 +11,9 @@
|
||||
<script>
|
||||
|
||||
var testFunc = ok;
|
||||
if (DriverInfo.getOS() == DriverInfo.OS.B2G) {
|
||||
testFunc = todo;
|
||||
}
|
||||
|
||||
function testContextRetrieval(canvasId, creationId, shouldSucceed) {
|
||||
var canvas = document.getElementById(canvasId);
|
||||
|
@ -550,11 +550,6 @@ TRY_AGAIN_POWER_OF_TWO:
|
||||
static const EGLint kEGLConfigAttribsOffscreenPBuffer[] = {
|
||||
LOCAL_EGL_SURFACE_TYPE, LOCAL_EGL_PBUFFER_BIT,
|
||||
LOCAL_EGL_RENDERABLE_TYPE, LOCAL_EGL_OPENGL_ES2_BIT,
|
||||
// Old versions of llvmpipe seem to need this to properly create the pbuffer (bug 981856)
|
||||
LOCAL_EGL_RED_SIZE, 8,
|
||||
LOCAL_EGL_GREEN_SIZE, 8,
|
||||
LOCAL_EGL_BLUE_SIZE, 8,
|
||||
LOCAL_EGL_ALPHA_SIZE, 0,
|
||||
EGL_ATTRIBS_LIST_SAFE_TERMINATION_WORKING_AROUND_BUGS
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user