diff options
Diffstat (limited to 'opengl/tests/testViewport')
-rw-r--r-- | opengl/tests/testViewport/Android.mk | 22 | ||||
-rw-r--r-- | opengl/tests/testViewport/AndroidManifest.xml | 33 | ||||
-rw-r--r-- | opengl/tests/testViewport/README | 28 | ||||
-rw-r--r-- | opengl/tests/testViewport/res/values/strings.xml | 25 | ||||
-rw-r--r-- | opengl/tests/testViewport/src/com/android/test/TestActivity.java | 46 | ||||
-rw-r--r-- | opengl/tests/testViewport/src/com/android/test/TestView.java | 262 |
6 files changed, 0 insertions, 416 deletions
diff --git a/opengl/tests/testViewport/Android.mk b/opengl/tests/testViewport/Android.mk deleted file mode 100644 index 9980e7d..0000000 --- a/opengl/tests/testViewport/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := TestViewport - -# Set a specific SDK version so we can run on Froyo. - -LOCAL_SDK_VERSION := 8 - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/testViewport/AndroidManifest.xml b/opengl/tests/testViewport/AndroidManifest.xml deleted file mode 100644 index ba178bb..0000000 --- a/opengl/tests/testViewport/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.test"> - <uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8" /> - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <application - android:label="@string/test_activity"> - <activity android:name="TestActivity" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:configChanges="orientation|keyboardHidden"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> -</manifest> diff --git a/opengl/tests/testViewport/README b/opengl/tests/testViewport/README deleted file mode 100644 index c06abc9..0000000 --- a/opengl/tests/testViewport/README +++ /dev/null @@ -1,28 +0,0 @@ -Repro steps: - -build, install and run the attached test program TestViewport.apk - -Run on Sapphire with Froyo. - -The program clears the screen to blue, then draws a full screen white quad that -is alligned to the screen. -(Therefore the whole screen should appear to be white.) - - -Note that screen is all white. - -Rotate screen 90 degrees. - -Expected: screen is still all white. - -Actual: screen is blue with offset white rectangle. - -This bug only happens on Sapphire, it works correctly on Passion. - -What happens: - -I think the bug is that the gl.glViewport() call in onSurfaceChanged() is -being ignored by the OpenGL driver. - -NOTE: If a gl.glViewport call is added at the beginning of the onDrawFrame() -call (which means it is called before every draw), the program runs correctly. diff --git a/opengl/tests/testViewport/res/values/strings.xml b/opengl/tests/testViewport/res/values/strings.xml deleted file mode 100644 index c037a7c..0000000 --- a/opengl/tests/testViewport/res/values/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> - -<!-- This file contains resource definitions for displayed strings, allowing - them to be changed based on the locale and options. --> - -<resources> - <!-- Simple strings. --> - <string name="test_activity">Test Viewport</string> - -</resources> - diff --git a/opengl/tests/testViewport/src/com/android/test/TestActivity.java b/opengl/tests/testViewport/src/com/android/test/TestActivity.java deleted file mode 100644 index cc7e450..0000000 --- a/opengl/tests/testViewport/src/com/android/test/TestActivity.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2007 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. - */ - -package com.android.test; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; - -public class TestActivity extends Activity { - private final static String TAG = "TestActivity"; - TestView mView; - - @Override - protected void onCreate(Bundle icicle) { - super.onCreate(icicle); - mView = new TestView(getApplication()); - mView.setFocusableInTouchMode(true); - setContentView(mView); - } - - @Override - protected void onPause() { - super.onPause(); - mView.onPause(); - } - - @Override - protected void onResume() { - super.onResume(); - mView.onResume(); - } -} diff --git a/opengl/tests/testViewport/src/com/android/test/TestView.java b/opengl/tests/testViewport/src/com/android/test/TestView.java deleted file mode 100644 index 23cc37d..0000000 --- a/opengl/tests/testViewport/src/com/android/test/TestView.java +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (C) 2009 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. - */ - -package com.android.test; -/* - * Copyright (C) 2008 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. - */ - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.CharBuffer; -import java.nio.FloatBuffer; - -import android.content.Context; -import android.opengl.GLSurfaceView; -import android.util.AttributeSet; -import android.util.Log; -import android.view.KeyEvent; -import android.view.MotionEvent; - -import javax.microedition.khronos.egl.EGL10; -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL; -import javax.microedition.khronos.opengles.GL10; -import javax.microedition.khronos.opengles.GL11; -/** - * An implementation of SurfaceView that uses the dedicated surface for - * displaying an OpenGL animation. This allows the animation to run in a - * separate thread, without requiring that it be driven by the update mechanism - * of the view hierarchy. - * - * The application-specific rendering code is delegated to a GLView.Renderer - * instance. - */ -class TestView extends GLSurfaceView { - TestView(Context context) { - super(context); - init(); - } - - public TestView(Context context, AttributeSet attrs) { - super(context, attrs); - init(); - } - - private void init() { - setRenderer(new Renderer()); - setRenderMode(RENDERMODE_WHEN_DIRTY); - } - - /** A grid is a topologically rectangular array of vertices. - * - * The vertex and index data are held in VBO objects because on most - * GPUs VBO objects are the fastest way of rendering static vertex - * and index data. - * - */ - - private static class Grid { - // Size of vertex data elements in bytes: - final static int FLOAT_SIZE = 4; - final static int CHAR_SIZE = 2; - - // Vertex structure: - // float x, y, z; - - final static int VERTEX_SIZE = 3 * FLOAT_SIZE; - - private int mVertexBufferObjectId; - private int mElementBufferObjectId; - - // These buffers are used to hold the vertex and index data while - // constructing the grid. Once createBufferObjects() is called - // the buffers are nulled out to save memory. - - private ByteBuffer mVertexByteBuffer; - private FloatBuffer mVertexBuffer; - private CharBuffer mIndexBuffer; - - private int mW; - private int mH; - private int mIndexCount; - - public Grid(int w, int h) { - if (w < 0 || w >= 65536) { - throw new IllegalArgumentException("w"); - } - if (h < 0 || h >= 65536) { - throw new IllegalArgumentException("h"); - } - if (w * h >= 65536) { - throw new IllegalArgumentException("w * h >= 65536"); - } - - mW = w; - mH = h; - int size = w * h; - - mVertexByteBuffer = ByteBuffer.allocateDirect(VERTEX_SIZE * size) - .order(ByteOrder.nativeOrder()); - mVertexBuffer = mVertexByteBuffer.asFloatBuffer(); - - int quadW = mW - 1; - int quadH = mH - 1; - int quadCount = quadW * quadH; - int indexCount = quadCount * 6; - mIndexCount = indexCount; - mIndexBuffer = ByteBuffer.allocateDirect(CHAR_SIZE * indexCount) - .order(ByteOrder.nativeOrder()).asCharBuffer(); - - /* - * Initialize triangle list mesh. - * - * [0]-----[ 1] ... - * | / | - * | / | - * | / | - * [w]-----[w+1] ... - * | | - * - */ - - { - int i = 0; - for (int y = 0; y < quadH; y++) { - for (int x = 0; x < quadW; x++) { - char a = (char) (y * mW + x); - char b = (char) (y * mW + x + 1); - char c = (char) ((y + 1) * mW + x); - char d = (char) ((y + 1) * mW + x + 1); - - mIndexBuffer.put(i++, a); - mIndexBuffer.put(i++, c); - mIndexBuffer.put(i++, b); - - mIndexBuffer.put(i++, b); - mIndexBuffer.put(i++, c); - mIndexBuffer.put(i++, d); - } - } - } - - } - - public void set(int i, int j, float x, float y, float z) { - if (i < 0 || i >= mW) { - throw new IllegalArgumentException("i"); - } - if (j < 0 || j >= mH) { - throw new IllegalArgumentException("j"); - } - - int index = mW * j + i; - - mVertexBuffer.position(index * VERTEX_SIZE / FLOAT_SIZE); - mVertexBuffer.put(x); - mVertexBuffer.put(y); - mVertexBuffer.put(z); - } - - public void createBufferObjects(GL gl) { - // Generate a the vertex and element buffer IDs - int[] vboIds = new int[2]; - GL11 gl11 = (GL11) gl; - gl11.glGenBuffers(2, vboIds, 0); - mVertexBufferObjectId = vboIds[0]; - mElementBufferObjectId = vboIds[1]; - - // Upload the vertex data - gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, mVertexBufferObjectId); - mVertexByteBuffer.position(0); - gl11.glBufferData(GL11.GL_ARRAY_BUFFER, mVertexByteBuffer.capacity(), mVertexByteBuffer, GL11.GL_STATIC_DRAW); - - gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, mElementBufferObjectId); - mIndexBuffer.position(0); - gl11.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer.capacity() * CHAR_SIZE, mIndexBuffer, GL11.GL_STATIC_DRAW); - - // We don't need the in-memory data any more - mVertexBuffer = null; - mVertexByteBuffer = null; - mIndexBuffer = null; - } - - public void draw(GL10 gl) { - GL11 gl11 = (GL11) gl; - - gl.glEnableClientState(GL10.GL_VERTEX_ARRAY); - - gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, mVertexBufferObjectId); - gl11.glVertexPointer(3, GL10.GL_FLOAT, VERTEX_SIZE, 0); - - gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, mElementBufferObjectId); - gl11.glDrawElements(GL10.GL_TRIANGLES, mIndexCount, GL10.GL_UNSIGNED_SHORT, 0); - gl.glDisableClientState(GL10.GL_VERTEX_ARRAY); - gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, 0); - gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, 0); - } - } - - - private class Renderer implements GLSurfaceView.Renderer { - private static final String TAG = "Renderer"; - private Grid mGrid; - - public void onDrawFrame(GL10 gl) { - gl.glClearColor(0,0,1,1); - gl.glClear(GL10.GL_COLOR_BUFFER_BIT); - mGrid.draw(gl); - } - - public void onSurfaceChanged(GL10 gl, int width, int height) { - gl.glViewport(0, 0, width, height); - gl.glMatrixMode(GL11.GL_PROJECTION); - gl.glLoadIdentity(); - gl.glOrthof(0, width, height, 0, -1, 1); - gl.glMatrixMode(GL11.GL_MODELVIEW); - createGrid(gl, width, height); - } - - public void onSurfaceCreated(GL10 gl, EGLConfig config) { - } - - private void createGrid(GL10 gl, float w, float h) { - mGrid = new Grid(2, 2); - for (int j = 0; j < 2; j++) { - for (int i = 0; i < 2; i++) { - float x = w * i; - float y = h * j; - float z = 0.0f; - mGrid.set(i,j, x, y, z); - } - } - mGrid.createBufferObjects(gl); - } - } -} - |