commit 97446d2f49b2cd6fa03c1e45ed29f16a5347706a
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Aug 24 19:20:54 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Aug 24 19:20:54 2010 +0000
tree 174b28026c63d88a5e1acc59afc966d1a36a5ba0
parent d470a1b5d32140021501269f1deb9f144fd6faa7

Implements multisample resolve capability
TRAC #12716
Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@392 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index fe689c1..53ac003 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -3214,7 +3214,8 @@
             return error(GL_INVALID_OPERATION); // only whole-buffer copies are permitted
         }
 
-        if (drawDSBuffer->getSamples() != 0)
+        if ((drawDSBuffer && drawDSBuffer->getSamples() != 0) || 
+            (readDSBuffer && readDSBuffer->getSamples() != 0))
         {
             return error(GL_INVALID_OPERATION);
         }