[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. eafe1c943cae1e57aee3
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. eafe1c943cae1e57aee3292468ceb44bd68c9c67 |
|
Date: |
Thu, 09 Dec 2010 15:45:42 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, openvg has been updated
via eafe1c943cae1e57aee3292468ceb44bd68c9c67 (commit)
via 92138ec4d0cc11faf2ca1af727187d8418b7e091 (commit)
from 5834d6c3eddac69e87a985194f4bb3d8ccec136f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=eafe1c943cae1e57aee3292468ceb44bd68c9c67
commit eafe1c943cae1e57aee3292468ceb44bd68c9c67
Author: Rob Savoye <address@hidden>
Date: Wed Dec 8 22:46:42 2010 -0700
don't try to access any devicde specific stuff if it's not initialized
diff --git a/libdevice/egl/eglDevice.h b/libdevice/egl/eglDevice.h
index 14d80a6..95161a9 100644
--- a/libdevice/egl/eglDevice.h
+++ b/libdevice/egl/eglDevice.h
@@ -212,105 +212,132 @@ class EGLDevice : public GnashDevice
}
// Make one of the pbuffers the current one to draw into
bool makePbufferCurrent() {
- if (!eglMakeCurrent(_eglDisplay, _eglSurface, _eglSurface,
_eglContext)) {
- log_error( "eglMakeCurrent() failed (error 0x%x)", eglGetError());
- return false;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
+ if (!eglMakeCurrent(_eglDisplay, _eglSurface, _eglSurface,
_eglContext)) {
+ log_error( "eglMakeCurrent() failed (error 0x%x)",
eglGetError());
+ return false;
+ }
}
+ return false;
}
bool makePbufferCurrent(size_t x) {
if (x < _pbuffers.size()) {
- if (!eglMakeCurrent(_eglDisplay, _pbuffers[x], _pbuffers[x],
_eglContext)) {
- log_error( "eglMakeCurrent() failed (error 0x%x)",
eglGetError());
- return false;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglContext !=
EGL_NO_CONTEXT)) {
+ if (!eglMakeCurrent(_eglDisplay, _pbuffers[x], _pbuffers[x],
_eglContext)) {
+ log_error( "eglMakeCurrent() failed (error 0x%x)",
eglGetError());
+ return false;
+ }
+ return true;
}
- return true;
+ return false;
}
- return false;
}
size_t getVerticalRes() {
- EGLint value;
- if (_eglSurface && _eglDisplay) {
+ EGLint value = 0;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
eglQuerySurface(_eglDisplay, _eglSurface, EGL_VERTICAL_RESOLUTION,
&value);
}
return static_cast<size_t>(value);
}
size_t getHorzRes() {
- EGLint value;
- if (_eglSurface && _eglDisplay) {
+ EGLint value = 0;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
eglQuerySurface(_eglDisplay, _eglSurface,
EGL_HORIZONTAL_RESOLUTION, &value);
}
return static_cast<size_t>(value);
}
bool isBackBuffered() {
EGLint value;
- if (_eglSurface && _eglDisplay) {
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
eglQuerySurface(_eglDisplay, _eglSurface, EGL_RENDER_BUFFER,
&value);
- }
- if (value == EGL_BACK_BUFFER) {
- return true;
+ if (value == EGL_BACK_BUFFER) {
+ return true;
+ }
+ return false;
}
return false;
}
bool isMultiSample() {
EGLint value;
- eglQuerySurface(_eglDisplay, _eglSurface, EGL_MULTISAMPLE_RESOLVE,
&value);
- if (value == EGL_MULTISAMPLE_RESOLVE_BOX) {
- return true;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
+ eglQuerySurface(_eglDisplay, _eglSurface, EGL_MULTISAMPLE_RESOLVE,
&value);
+ if (value == EGL_MULTISAMPLE_RESOLVE_BOX) {
+ return true;
+ }
+ return false;
}
return false;
}
EGLint getSurfaceID() {
- EGLint value;
- eglQuerySurface(_eglDisplay, _eglSurface, EGL_CONFIG_ID, &value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglSurface !=
EGL_NO_SURFACE)) {
+ eglQuerySurface(_eglDisplay, _eglSurface, EGL_CONFIG_ID, &value);
+ }
return value;
}
// Context accessors
EGLint getContextID() {
- EGLint value;
- eglQueryContext(_eglDisplay, _eglContext, EGL_CONFIG_ID, &value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglContext !=
EGL_NO_CONTEXT)) {
+ eglQueryContext(_eglDisplay, _eglContext, EGL_CONFIG_ID, &value);
+ }
return value;
}
bool isContextSingleBuffered() {
EGLint value;
- eglQueryContext(_eglDisplay, _eglContext, EGL_RENDER_BUFFER, &value);
- if (value == EGL_SINGLE_BUFFER) {
- return true;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglContext !=
EGL_NO_CONTEXT)) {
+ eglQueryContext(_eglDisplay, _eglContext, EGL_RENDER_BUFFER,
&value);
+ if (value == EGL_SINGLE_BUFFER) {
+ return true;
+ }
+ return false;
}
return false;
}
bool isContextBackBuffered() {
EGLint value;
- eglQueryContext(_eglDisplay, _eglContext, EGL_RENDER_BUFFER, &value);
- if (value == EGL_BACK_BUFFER) {
- return true;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglContext !=
EGL_NO_CONTEXT)) {
+ eglQueryContext(_eglDisplay, _eglContext, EGL_RENDER_BUFFER,
&value);
+ if (value == EGL_BACK_BUFFER) {
+ return true;
+ }
+ return false;
}
return false;
}
// Config accessors
EGLint getSamples() {
- EGLint value;
- eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_SAMPLES, &value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglConfig != 0)) {
+ eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_SAMPLES, &value);
+ }
return value;
}
EGLint getSampleBuffers() {
- EGLint value;
- eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_SAMPLE_BUFFERS,
&value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglConfig != 0)) {
+ eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_SAMPLE_BUFFERS,
&value);
+ }
return value;
}
EGLint getMaxSwapInterval() {
- EGLint value;
- eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_MAX_SWAP_INTERVAL,
&value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglConfig != 0)) {
+ eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_MAX_SWAP_INTERVAL,
&value);
+ }
return value;
}
EGLint getMinSwapInterval() {
- EGLint value;
- eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_MIN_SWAP_INTERVAL,
&value);
+ EGLint value = -1;
+ if ((_eglDisplay != EGL_NO_DISPLAY) && (_eglConfig != 0)) {
+ eglGetConfigAttrib(_eglDisplay, _eglConfig, EGL_MIN_SWAP_INTERVAL,
&value);
+ }
return value;
}
http://git.savannah.gnu.org/cgit//commit/?id=92138ec4d0cc11faf2ca1af727187d8418b7e091
commit 92138ec4d0cc11faf2ca1af727187d8418b7e091
Author: Rob Savoye <address@hidden>
Date: Wed Dec 8 22:20:15 2010 -0700
don't FAIL all the teets if initDevice() doesn't work, make them untested
instead.
diff --git a/libdevice/egl/test_egl.cpp b/libdevice/egl/test_egl.cpp
index c391f45..de582e8 100644
--- a/libdevice/egl/test_egl.cpp
+++ b/libdevice/egl/test_egl.cpp
@@ -91,16 +91,46 @@ main(int argc, char *argv[])
void
test_egl(EGLDevice &egl, GnashDevice::rtype_t rtype, int argc, char *argv[])
{
+ bool hwinit = false;
+
+ // This is a utility method for converting integer error codes to
+ // something human readable for debugging.
+ string result = "EGL_BAD_CONFIG";
+ if (egl.getErrorString(EGL_BAD_CONFIG) == result) {
+ runtest.pass("EGLDevice::getErrorString()");
+ } else {
+ runtest.fail("EGLDevice::getErrorString()");
+ }
+
if (egl.initDevice(argc, argv)) {
runtest.pass("EGLDevice::initDevice()");
+ hwinit = true;
} else {
runtest.fail("EGLDevice::initDevice()");
}
- if (egl.bindClient(rtype)) {
- runtest.pass("EGLDevice::bindClient()");
- } else {
- runtest.fail("EGLDevice::bindClient()");
+ if (hwinit) {
+ if (egl.bindClient(rtype)) {
+ runtest.pass("EGLDevice::bindClient()");
+ } else {
+ runtest.fail("EGLDevice::bindClient()");
+ }
+ } else {
+ runtest.untested("EGLDevice::bindClient()");
+ }
+
+// egl.printEGLConfig();
+
+ // If there are more than zero configurations, something beyond
+ // initializing is working
+ if (hwinit) {
+ if (egl.queryEGLConfig()) {
+ runtest.pass("EGLDevice::queryEGLConfig()");
+ } else {
+ runtest.fail("EGLDevice::queryEGLConfig()");
+ }
+ } else {
+ runtest.untested("EGLDevice::queryEGLConfig()");
}
#if 0
@@ -113,101 +143,136 @@ test_egl(EGLDevice &egl, GnashDevice::rtype_t rtype,
int argc, char *argv[])
}
#endif
- // If there are more than zero configurations, something beyond
- // initializing is working
- if (egl.queryEGLConfig()) {
- runtest.pass("EGLDevice::queryEGLConfig()");
- } else {
- runtest.fail("EGLDevice::queryEGLConfig()");
- }
-
- // This is a utility method for converting integer error codes to
- // something human readable for debugging.
- string result = "EGL_BAD_CONFIG";
- if (egl.getErrorString(EGL_BAD_CONFIG) == result) {
- runtest.pass("EGLDevice::getErrorString()");
- } else {
- runtest.fail("EGLDevice::getErrorString()");
+ if (hwinit) {
+ if (egl.supportsRenderer(rtype)) {
+ runtest.pass("EGLDevice::supportsRenderer()");
+ } else {
+ runtest.fail("EGLDevice::supportsRenderer()");
+ }
+ } else {
+ runtest.untested("EGLDevice::supportsRenderer()");
}
-
- if (egl.supportsRenderer(rtype)) {
- runtest.pass("EGLDevice::supportsRenderer()");
- } else {
- runtest.fail("EGLDevice::supportsRenderer()");
+
+ if (hwinit) {
+ if (egl.getRedSize() > 0) {
+ runtest.pass("EGLDevice::getRedSize()");
+ } else {
+ runtest.fail("EGLDevice::getRedSize()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getRedSize()");
}
- if (egl.getRedSize() > 0) {
- runtest.pass("EGLDevice::getRedSize()");
- } else {
- runtest.fail("EGLDevice::getRedSize()");
- }
-
- if (egl.getGreenSize() > 0) {
- runtest.pass("EGLDevice::getGreenSize()");
- } else {
- runtest.fail("EGLDevice::getGreenSize()");
- }
+ if (hwinit) {
+ if (egl.getGreenSize() > 0) {
+ runtest.pass("EGLDevice::getGreenSize()");
+ } else {
+ runtest.fail("EGLDevice::getGreenSize()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getGreenSize()");
+ }
- if (egl.getBlueSize() > 0) {
- runtest.pass("EGLDevice::getBlueSize()");
- } else {
- runtest.fail("EGLDevice::getBlueSize()");
- }
+ if (hwinit) {
+ if (egl.getBlueSize() > 0) {
+ runtest.pass("EGLDevice::getBlueSize()");
+ } else {
+ runtest.fail("EGLDevice::getBlueSize()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getBlueSize()");
+ }
// Surface config info tests
- if (egl.getSurfaceID()) {
- runtest.pass("EGLDevice::getSurfaceID()");
- } else {
- runtest.fail("EGLDevice::getSurfaceID()");
+ if (hwinit) {
+ if (egl.getSurfaceID()) {
+ runtest.pass("EGLDevice::getSurfaceID()");
+ } else {
+ runtest.fail("EGLDevice::getSurfaceID()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getSurfaceID()");
}
- if (egl.getWidth()) {
- runtest.pass("EGLDevice::getWidth()");
- } else {
- runtest.fail("EGLDevice::getWidth()");
+ if (hwinit) {
+ if (egl.getWidth()) {
+ runtest.pass("EGLDevice::getWidth()");
+ } else {
+ runtest.fail("EGLDevice::getWidth()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getWidth()");
}
- if (egl.getHeight()) {
- runtest.pass("EGLDevice::getHeigth()");
- } else {
- runtest.fail("EGLDevice::getHeigth()");
+ if (hwinit) {
+ if (egl.getHeight()) {
+ runtest.pass("EGLDevice::getHeigth()");
+ } else {
+ runtest.fail("EGLDevice::getHeigth()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getHeigth()");
}
- if (egl.getVerticalRes()) {
- runtest.pass("EGLDevice::getVerticalRes()");
- } else {
- runtest.fail("EGLDevice::getVerticalRes()");
+ if (hwinit) {
+ if (egl.getVerticalRes()) {
+ runtest.pass("EGLDevice::getVerticalRes()");
+ } else {
+ runtest.fail("EGLDevice::getVerticalRes()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getVerticalRes()");
}
- if (egl.getHorzRes()) {
- runtest.pass("EGLDevice::getHorzRes()");
- } else {
- runtest.fail("EGLDevice::getHorzRes()");
+ if (hwinit) {
+ if (egl.getHorzRes()) {
+ runtest.pass("EGLDevice::getHorzRes()");
+ } else {
+ runtest.fail("EGLDevice::getHorzRes()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getHorzRes()");
}
- if (egl.isSingleBuffered() != egl.isBackBuffered()) {
- runtest.pass("EGLDevice::is*Buffered()");
- } else {
- runtest.fail("EGLDevice::is*Buffered()");
+ if (hwinit) {
+ if (egl.isSingleBuffered() != egl.isBackBuffered()) {
+ runtest.pass("EGLDevice::is*Buffered()");
+ } else {
+ runtest.fail("EGLDevice::is*Buffered()");
+ }
+ } else {
+ runtest.untested("EGLDevice::is*Buffered()");
}
- if (egl.isBufferDestroyed()) {
- runtest.pass("EGLDevice::isBufferDestroyed()");
- } else {
- runtest.fail("EGLDevice::isBufferDestroyed()");
+ if (hwinit) {
+ if (egl.isBufferDestroyed()) {
+ runtest.pass("EGLDevice::isBufferDestroyed()");
+ } else {
+ runtest.fail("EGLDevice::isBufferDestroyed()");
+ }
+ } else {
+ runtest.untested("EGLDevice::isBufferDestroyed()");
}
- if (!egl.isMultiSample()) {
- runtest.pass("EGLDevice::isMultiSample()");
- } else {
- runtest.fail("EGLDevice::isMultiSample()");
+ if (hwinit) {
+ if (!egl.isMultiSample()) {
+ runtest.pass("EGLDevice::isMultiSample()");
+ } else {
+ runtest.fail("EGLDevice::isMultiSample()");
+ }
+ } else {
+ runtest.untested("EGLDevice::isMultiSample()");
}
// Context accessor tests
- if (egl.getContextID()) {
- runtest.pass("EGLDevice::getContextID()");
- } else {
- runtest.fail("EGLDevice::getContextID()");
+ if (hwinit) {
+ if (egl.getContextID()) {
+ runtest.pass("EGLDevice::getContextID()");
+ } else {
+ runtest.fail("EGLDevice::getContextID()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getContextID()");
}
#if 0
@@ -218,54 +283,86 @@ test_egl(EGLDevice &egl, GnashDevice::rtype_t rtype, int
argc, char *argv[])
}
#endif
- if (egl.isContextSingleBuffered() != egl.isContextBackBuffered()) {
- runtest.pass("EGLDevice::isContext*Buffered()");
- } else {
- runtest.fail("EGLDevice::isContext*Buffered()");
+ if (hwinit) {
+ if (egl.isContextSingleBuffered() != egl.isContextBackBuffered()) {
+ runtest.pass("EGLDevice::isContext*Buffered()");
+ } else {
+ runtest.fail("EGLDevice::isContext*Buffered()");
+ }
+ } else {
+ runtest.untested("EGLDevice::isContext*Buffered()");
}
- if (egl.isNativeRender()) {
- runtest.pass("EGLDevice::isNativeRender()");
- } else {
- runtest.fail("EGLDevice::isNativeRender()");
+ if (hwinit) {
+ if (egl.isNativeRender()) {
+ runtest.pass("EGLDevice::isNativeRender()");
+ } else {
+ runtest.fail("EGLDevice::isNativeRender()");
+ }
+ } else {
+ runtest.untested("EGLDevice::isNativeRender()");
}
- if (egl.getSamples() == 0) {
- runtest.pass("EGLDevice::getSamples()");
- } else {
- runtest.fail("EGLDevice::getSamples()");
+ if (hwinit) {
+ if (egl.getSamples() == 0) {
+ runtest.pass("EGLDevice::getSamples()");
+ } else {
+ runtest.fail("EGLDevice::getSamples()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getSamples()");
}
- if (egl.getSampleBuffers() == 0) {
- runtest.pass("EGLDevice::getSampleBuffers()");
- } else {
- runtest.fail("EGLDevice::getSampleBuffers()");
+ if (hwinit) {
+ if (egl.getSampleBuffers() == 0) {
+ runtest.pass("EGLDevice::getSampleBuffers()");
+ } else {
+ runtest.fail("EGLDevice::getSampleBuffers()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getSampleBuffers()");
}
- if (egl.getDepth()) {
- runtest.pass("EGLDevice::getDepth()");
- } else {
- runtest.fail("EGLDevice::getDepth()");
+ if (hwinit) {
+ if (egl.getDepth()) {
+ runtest.pass("EGLDevice::getDepth()");
+ } else {
+ runtest.fail("EGLDevice::getDepth()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getDepth()");
}
- if (egl.getMaxSwapInterval() == 0) {
- runtest.pass("EGLDevice::getMaxSwapInterval()");
- } else {
- runtest.fail("EGLDevice::getMaxSwapInterval()");
+ if (hwinit) {
+ if (egl.getMaxSwapInterval() == 0) {
+ runtest.pass("EGLDevice::getMaxSwapInterval()");
+ } else {
+ runtest.fail("EGLDevice::getMaxSwapInterval()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getMaxSwapInterval()");
}
- if (egl.getMinSwapInterval() == 0) {
- runtest.pass("EGLDevice::getMinSwapInterval()");
- } else {
- runtest.fail("EGLDevice::getMinSwapInterval()");
+ if (hwinit) {
+ if (egl.getMinSwapInterval() == 0) {
+ runtest.pass("EGLDevice::getMinSwapInterval()");
+ } else {
+ runtest.fail("EGLDevice::getMinSwapInterval()");
+ }
+ } else {
+ runtest.untested("EGLDevice::getMinSwapInterval()");
}
// Test Pbuffers
- EGLSurface surf = egl.createPbuffer(200, 200);
- if ((surf != EGL_NO_SURFACE) && (egl.getWidth(surf) == 200)) {
- runtest.pass("EGLDevice::createPbuffer(int, int)");
- } else {
- runtest.fail("EGLDevice::createPbuffer(int, int)");
+ if (hwinit) {
+ EGLSurface surf = egl.createPbuffer(200, 200);
+ if ((surf != EGL_NO_SURFACE) && (egl.getWidth(surf) == 200)) {
+ runtest.pass("EGLDevice::createPbuffer(int, int)");
+ } else {
+ runtest.fail("EGLDevice::createPbuffer(int, int)");
+ }
+ } else {
+ runtest.untested("EGLDevice::createPbuffer(int, int)");
}
// EGLSurface surf1 = egl[0];
@@ -279,33 +376,47 @@ test_egl(EGLDevice &egl, GnashDevice::rtype_t rtype, int
argc, char *argv[])
EGLSurface surf2 = egl.createPbuffer(300, 300);
EGLSurface surf3 = egl.createPbuffer(400, 400);
- if (egl.totalPbuffers() == 3) {
- runtest.pass("EGLDevice::totalPbuffers(2)");
- } else {
- runtest.fail("EGLDevice::totalPbuffers(2)");
+ if (hwinit) {
+ if (egl.totalPbuffers() == 3) {
+ runtest.pass("EGLDevice::totalPbuffers(2)");
+ } else {
+ runtest.fail("EGLDevice::totalPbuffers(2)");
+ }
}
// Since we're EGL_SINGLE_BUFFER'd, this is a nop
- if (egl.swapPbuffers()) {
- runtest.pass("EGLDevice::swapPbuffers()");
- } else {
- runtest.fail("EGLDevice::swapPbuffers()");
+ if (hwinit) {
+ if (egl.swapPbuffers()) {
+ runtest.pass("EGLDevice::swapPbuffers()");
+ } else {
+ runtest.fail("EGLDevice::swapPbuffers()");
+ }
+ } else {
+ runtest.untested("EGLDevice::swapPbuffers()");
}
egl.makePbufferCurrent(1);
EGLSurface surf4 = eglGetCurrentSurface(EGL_DRAW);
- if ((egl.getWidth(surf4) == 300) && ((egl.getHeight(surf4) == 300))) {
- runtest.pass("EGLDevice::makePbufferCurrent(int)");
- } else {
- runtest.fail("EGLDevice::makePbufferCurrent(int)");
+ if (hwinit) {
+ if ((egl.getWidth(surf4) == 300) && ((egl.getHeight(surf4) == 300))) {
+ runtest.pass("EGLDevice::makePbufferCurrent(int)");
+ } else {
+ runtest.fail("EGLDevice::makePbufferCurrent(int)");
+ }
+ } else {
+ runtest.untested("EGLDevice::makePbufferCurrent(int)");
}
// This should trigger an error as the number is more than we
// have created
- if (!egl.makePbufferCurrent(10)) {
- runtest.pass("EGLDevice::makePbufferCurrent(maxed)");
- } else {
- runtest.fail("EGLDevice::makePbufferCurrent(maxed)");
+ if (hwinit) {
+ if (!egl.makePbufferCurrent(10)) {
+ runtest.pass("EGLDevice::makePbufferCurrent(maxed)");
+ } else {
+ runtest.fail("EGLDevice::makePbufferCurrent(maxed)");
+ }
+ } else {
+ runtest.untested("EGLDevice::makePbufferCurrent(maxed)");
}
#if 0
-----------------------------------------------------------------------
Summary of changes:
libdevice/egl/eglDevice.h | 101 ++++++++-----
libdevice/egl/test_egl.cpp | 361 +++++++++++++++++++++++++++++---------------
2 files changed, 300 insertions(+), 162 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. eafe1c943cae1e57aee3292468ceb44bd68c9c67,
Rob Savoye <=