Merge change 20208 (1738a78c) · Commits · e / os / android_frameworks_native

opengl/tests/fillrate/fillrate.cpp

+37 −5

Original line number	Diff line number	Diff line
		@@ -88,19 +88,25 @@ int main(int argc, char** argv)
		glBindTexture(GL_TEXTURE_2D, 0);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
		glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		glDisable(GL_DITHER);
		glDisable(GL_BLEND);
		glEnable(GL_BLEND);
		glEnable(GL_TEXTURE_2D);
		glColor4f(1,1,1,1);

		uint32_t* t32 = (uint32_t)malloc(512512*4);
		for (int y=0 ; y<512 ; y++) {
		for (int x=0 ; x<512 ; x++) {
		int u = x-256;
		int v = y-256;
		if (uu+vv < 256*256) {
		t32[x+y*512] = 0x10FFFFFF;
		} else {
		t32[x+y*512] = 0x20FF0000;
		}
		}
		}

		@@ -127,14 +133,30 @@ int main(int argc, char** argv)

		glEnableClientState(GL_VERTEX_ARRAY);
		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
		glVertexPointer(2, GL_FIXED, 0, vertices);
		glVertexPointer(2, GL_FLOAT, 0, vertices);
		glTexCoordPointer(2, GL_FLOAT, 0, texCoords);

		eglSwapInterval(dpy, 1);

		glClearColor(1,0,0,0);
		glClear(GL_COLOR_BUFFER_BIT);
		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
		eglSwapBuffers(dpy, surface);


		nsecs_t times[32];

		for (int c=1 ; c<32 ; c++) {
		glClear(GL_COLOR_BUFFER_BIT);
		for (int i=0 ; i<c ; i++) {
		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
		}
		eglSwapBuffers(dpy, surface);
		}


		// for (int c=31 ; c>=1 ; c--) {
		int j=0;
		for (int c=1 ; c<32 ; c++) {
		glClear(GL_COLOR_BUFFER_BIT);
		nsecs_t now = systemTime();
		@@ -143,7 +165,17 @@ int main(int argc, char** argv)
		}
		eglSwapBuffers(dpy, surface);
		nsecs_t t = systemTime() - now;
		times[j++] = t;
		}

		for (int c=1, j=0 ; c<32 ; c++, j++) {
		nsecs_t t = times[j];
		printf("%lld\t%d\t%f\n", t, c, (double(t)/c)/1000000.0);
		}



		eglTerminate(dpy);

		return 0;
		}

opengl/tests/swapinterval/Android.mk

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		swapinterval.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libEGL \
		libGLESv1_CM \
		libui

		LOCAL_MODULE:= test-opengl-swapinterval

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_EXECUTABLE)

opengl/tests/swapinterval/swapinterval.cpp

0 → 100644

+124 −0

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2006, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		#define LOG_TAG "fillrate"

		#include <stdlib.h>
		#include <stdio.h>

		#include <EGL/egl.h>
		#include <GLES/gl.h>
		#include <GLES/glext.h>

		#include <utils/StopWatch.h>
		#include <ui/FramebufferNativeWindow.h>

		using namespace android;

		int main(int argc, char** argv)
		{
		EGLint configAttribs[] = {
		EGL_DEPTH_SIZE, 0,
		EGL_NONE
		};

		EGLint numConfigs = -1, n=0;
		EGLint majorVersion;
		EGLint minorVersion;
		EGLConfig config;
		EGLContext context;
		EGLSurface surface;
		EGLint w, h;

		EGLDisplay dpy;

		dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
		eglInitialize(dpy, &majorVersion, &minorVersion);

		// Get all the "potential match" configs...
		eglGetConfigs(dpy, NULL, 0, &numConfigs);
		EGLConfig* const configs = (EGLConfig)malloc(sizeof(EGLConfig)numConfigs);
		eglChooseConfig(dpy, configAttribs, configs, numConfigs, &n);
		config = configs[0];
		if (n > 1) {
		// if there is more than one candidate, go through the list
		// and pick one that matches our framebuffer format
		int fbSzA = 0; // should not hardcode
		int fbSzR = 5; // should not hardcode
		int fbSzG = 6; // should not hardcode
		int fbSzB = 5; // should not hardcode
		int i;
		for (i=0 ; i<n ; i++) {
		EGLint r,g,b,a;
		eglGetConfigAttrib(dpy, configs[i], EGL_RED_SIZE, &r);
		eglGetConfigAttrib(dpy, configs[i], EGL_GREEN_SIZE, &g);
		eglGetConfigAttrib(dpy, configs[i], EGL_BLUE_SIZE, &b);
		eglGetConfigAttrib(dpy, configs[i], EGL_ALPHA_SIZE, &a);
		if (fbSzA == a && fbSzR == r && fbSzG == g && fbSzB == b) {
		config = configs[i];
		break;
		}
		}
		}
		free(configs);

		surface = eglCreateWindowSurface(dpy, config,
		android_createDisplaySurface(), NULL);
		context = eglCreateContext(dpy, config, NULL, NULL);
		eglMakeCurrent(dpy, surface, surface, context);
		eglQuerySurface(dpy, surface, EGL_WIDTH, &w);
		eglQuerySurface(dpy, surface, EGL_HEIGHT, &h);

		printf("w=%d, h=%d\n", w, h);

		glDisable(GL_DITHER);
		glEnable(GL_BLEND);

		glViewport(0, 0, w, h);
		glOrthof(0, w, 0, h, 0, 1);

		eglSwapInterval(dpy, 1);

		glClearColor(1,0,0,0);
		glClear(GL_COLOR_BUFFER_BIT);
		eglSwapBuffers(dpy, surface);


		int time = 10;
		printf("screen should flash red/green quickly for %d s...\n", time);

		int c = 0;
		nsecs_t start = systemTime();
		nsecs_t t;
		do {
		glClearColor(1,0,0,0);
		glClear(GL_COLOR_BUFFER_BIT);
		eglSwapBuffers(dpy, surface);
		glClearColor(0,1,0,0);
		glClear(GL_COLOR_BUFFER_BIT);
		eglSwapBuffers(dpy, surface);
		t = systemTime() - start;
		c += 2;
		} while (int(ns2s(t))<=time);

		double p = (double(t) / c) / 1000000000.0;
		printf("refresh-rate is %f fps (%f ms)\n", 1.0f/p, p*1000.0);

		eglTerminate(dpy);

		return 0;
		}