Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1197)

Unified Diff: ppapi/tests/test_graphics_3d.cc

Issue 10544104: Add more testing to trusted graphics_3d. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ppapi/tests/test_graphics_3d.h ('K') | « ppapi/tests/test_graphics_3d.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_graphics_3d.cc
===================================================================
--- ppapi/tests/test_graphics_3d.cc (revision 141562)
+++ ppapi/tests/test_graphics_3d.cc (working copy)
@@ -1,31 +1,41 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ppapi/tests/test_graphics_3d.h"
#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "ppapi/c/dev/ppb_testing_dev.h"
#include "ppapi/c/ppb_opengles2.h"
#include "ppapi/cpp/graphics_3d.h"
#include "ppapi/cpp/module.h"
+#include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
#include "ppapi/tests/test_utils.h"
#include "ppapi/tests/testing_instance.h"
+const int32_t kInvalidContext = 0;
+
REGISTER_TEST_CASE(Graphics3D);
bool TestGraphics3D::Init() {
opengl_es2_ = static_cast<const PPB_OpenGLES2*>(
pp::Module::Get()->GetBrowserInterface(PPB_OPENGLES2_INTERFACE));
+ glInitializePPAPI(pp::Module::Get()->get_browser_interface());
return opengl_es2_ && CheckTestingInterface();
}
void TestGraphics3D::RunTests(const std::string& filter) {
- RUN_TEST(Frame, filter);
+ RUN_TEST(FramePPAPI, filter);
+ RUN_TEST(FrameGL, filter);
+ RUN_TEST(ExtensionsGL, filter);
}
-std::string TestGraphics3D::TestFrame() {
+std::string TestGraphics3D::TestFramePPAPI() {
const int width = 16;
const int height = 16;
const int32_t attribs[] = {
@@ -36,20 +46,94 @@
pp::Graphics3D context(instance_, attribs);
ASSERT_FALSE(context.is_null());
+ const uint8_t red_color[4] = {255, 0, 0, 255};
+
+ // Access OpenGLES API through the PPAPI interface.
// Clear color buffer to opaque red.
opengl_es2_->ClearColor(context.pp_resource(), 1.0f, 0.0f, 0.0f, 1.0f);
opengl_es2_->Clear(context.pp_resource(), GL_COLOR_BUFFER_BIT);
// Check if the color buffer has opaque red.
+ std::string error = TestPixelPPAPI(&context, width/2, height/2, red_color);
+ if (!error.empty())
+ return error;
+
+ int32_t rv = SwapBuffersSync(&context);
+ ASSERT_EQ(rv, PP_OK);
+
+ PASS();
+}
+
+std::string TestGraphics3D::TestFrameGL() {
+ const int width = 16;
+ const int height = 16;
+ const int32_t attribs[] = {
+ PP_GRAPHICS3DATTRIB_WIDTH, width,
+ PP_GRAPHICS3DATTRIB_HEIGHT, height,
+ PP_GRAPHICS3DATTRIB_NONE
+ };
+ pp::Graphics3D context(instance_, attribs);
+ ASSERT_FALSE(context.is_null());
+
const uint8_t red_color[4] = {255, 0, 0, 255};
- std::string error = TestPixel(&context, width/2, height/2, red_color);
+ // Perform same operations as TestFramePPAPI, but use OpenGLES API directly.
+ // This is how most developers will use OpenGLES.
+ glSetCurrentContextPPAPI(context.pp_resource());
+ glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+ std::string error = TestPixelGL(width/2, height/2, red_color);
+ glSetCurrentContextPPAPI(kInvalidContext);
if (!error.empty())
return error;
int32_t rv = SwapBuffersSync(&context);
ASSERT_EQ(rv, PP_OK);
+
PASS();
}
+std::string TestGraphics3D::TestExtensionsGL() {
+ const int width = 16;
+ const int height = 16;
+ const int32_t attribs[] = {
+ PP_GRAPHICS3DATTRIB_WIDTH, width,
+ PP_GRAPHICS3DATTRIB_HEIGHT, height,
+ PP_GRAPHICS3DATTRIB_NONE
+ };
+ pp::Graphics3D context(instance_, attribs);
+ ASSERT_FALSE(context.is_null());
+
+ glSetCurrentContextPPAPI(context.pp_resource());
+ glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ // Ask about a couple of extensions via glGetString. If an extension is
+ // available, try a couple of trivial calls. This test is not intended
+ // to be exhaustive; check the source can compile, link, and run without
+ // crashing.
+ ASSERT_NE(glGetString(GL_VERSION), NULL);
+ const char* ext = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+ if (strstr(ext, "GL_EXT_occlusion_query_boolean")) {
+ GLuint a_query;
+ GLboolean is_a_query;
+ glGenQueriesEXT(1, &a_query);
+ ASSERT_NE(a_query, 0);
+ glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, a_query);
+ is_a_query = glIsQueryEXT(a_query);
+ ASSERT_EQ(is_a_query, GL_TRUE);
+ glEndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
+ glDeleteQueriesEXT(1, &a_query);
+ }
+ if (strstr(ext, "GL_ANGLE_instanced_arrays")) {
+ glDrawArraysInstancedANGLE(GL_TRIANGLE_STRIP, 0, 0, 0);
+ }
+ glSetCurrentContextPPAPI(kInvalidContext);
+
+ int32_t rv = SwapBuffersSync(&context);
+ ASSERT_EQ(rv, PP_OK);
+
+ PASS();
+}
+
int32_t TestGraphics3D::SwapBuffersSync(pp::Graphics3D* context) {
TestCompletionCallback callback(instance_->pp_instance(), true);
int32_t rv = context->SwapBuffers(callback);
@@ -59,7 +143,7 @@
return callback.WaitForResult();
}
-std::string TestGraphics3D::TestPixel(
+std::string TestGraphics3D::TestPixelPPAPI(
pp::Graphics3D* context,
int x, int y, const uint8_t expected_color[4]) {
GLubyte pixel_color[4];
@@ -73,3 +157,15 @@
PASS();
}
+std::string TestGraphics3D::TestPixelGL(
+ int x, int y, const uint8_t expected_color[4]) {
+ GLubyte pixel_color[4];
+ glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel_color);
+
+ ASSERT_EQ(pixel_color[0], expected_color[0]);
+ ASSERT_EQ(pixel_color[1], expected_color[1]);
+ ASSERT_EQ(pixel_color[2], expected_color[2]);
+ ASSERT_EQ(pixel_color[3], expected_color[3]);
+ PASS();
+}
+
« ppapi/tests/test_graphics_3d.h ('K') | « ppapi/tests/test_graphics_3d.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698