2010-03-12 02:20:12 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
Manually merge 129, 174, and 233 from donut
This adds a static OpenGL ES API.
Here are the three commit messages for the original changes:
Clean up trivial Eclipse warnings and fix whitespace.
Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.
This is the 2nd commit message:
Improve glgen
+ gen script is really a bash script rather than a sh script,
so declare that to be true. (For example, it uses pushd,
which is a part of bash, but not a part of sh. Not sure
how this worked until now. Possibly gen was only run in
environments where /bin/sh was really bash.
+ Check the results of the java compile of the code generator,
and abort the script if the compile fails.
+ Turn on the bash shell option that guards against using
uninitialized variables in the script.
+ Remove the generated class files.
Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
This is the 3rd commit message:
Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:
android.opengl.GLES10
android.opengl.GLES10Ext
android.opengl.GLES11
android.opengl.GLES11Ext
Benefits:
+ The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
+ The static API is similar to the C API, which should make it easier to import C-based
example code.
+ The static API provides a clear path for adding new OpenGL ES 1.1 extensions
and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.
Example:
import static android.opengl.GLES10.*;
...
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.
Implementation details:
This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.
As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-13 23:22:25 +00:00
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
public class JFunc {
|
|
|
|
|
|
|
|
String className = "com.google.android.gles_jni.GL11Impl";
|
|
|
|
|
|
|
|
CFunc cfunc;
|
|
|
|
JType ftype;
|
|
|
|
String fname;
|
|
|
|
|
|
|
|
List<String> argNames = new ArrayList<String>();
|
|
|
|
List<JType> argTypes = new ArrayList<JType>();
|
|
|
|
List<Integer> argCIndices = new ArrayList<Integer>();
|
|
|
|
|
|
|
|
boolean hasBufferArg = false;
|
|
|
|
boolean hasTypedBufferArg = false;
|
|
|
|
ArrayList<String> bufferArgNames = new ArrayList<String>();
|
|
|
|
|
|
|
|
public JFunc(CFunc cfunc) {
|
|
|
|
this.cfunc = cfunc;
|
|
|
|
}
|
|
|
|
|
|
|
|
public CFunc getCFunc() {
|
|
|
|
return cfunc;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void setName(String fname) {
|
|
|
|
this.fname = fname;
|
|
|
|
}
|
|
|
|
|
|
|
|
public String getName() {
|
|
|
|
return fname;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void setType(JType ftype) {
|
|
|
|
this.ftype = ftype;
|
|
|
|
}
|
|
|
|
|
|
|
|
public JType getType() {
|
|
|
|
return ftype;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void setClassName(String className) {
|
|
|
|
this.className = className;
|
|
|
|
}
|
|
|
|
|
|
|
|
public String getClassName() {
|
|
|
|
return className;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean hasBufferArg() {
|
|
|
|
return hasBufferArg;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean hasTypedBufferArg() {
|
|
|
|
return hasTypedBufferArg;
|
|
|
|
}
|
|
|
|
|
|
|
|
public String getBufferArgName(int index) {
|
|
|
|
return bufferArgNames.get(index);
|
|
|
|
}
|
|
|
|
|
|
|
|
public void addArgument(String argName, JType argType, int cindex) {
|
|
|
|
argNames.add(argName);
|
|
|
|
argTypes.add(argType);
|
|
|
|
argCIndices.add(new Integer(cindex));
|
|
|
|
|
|
|
|
if (argType.isBuffer()) {
|
|
|
|
hasBufferArg = true;
|
|
|
|
bufferArgNames.add(argName);
|
|
|
|
}
|
|
|
|
if (argType.isTypedBuffer()) {
|
|
|
|
hasTypedBufferArg = true;
|
|
|
|
bufferArgNames.add(argName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getNumArgs() {
|
|
|
|
return argNames.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getArgIndex(String name) {
|
|
|
|
int len = argNames.size();
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
if (name.equals(argNames.get(i))) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
public String getArgName(int index) {
|
|
|
|
return argNames.get(index);
|
|
|
|
}
|
|
|
|
|
|
|
|
public JType getArgType(int index) {
|
|
|
|
return argTypes.get(index);
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getArgCIndex(int index) {
|
|
|
|
return argCIndices.get(index).intValue();
|
|
|
|
}
|
|
|
|
|
|
|
|
public static JFunc convert(CFunc cfunc, boolean useArray) {
|
|
|
|
try {
|
|
|
|
JFunc jfunc = new JFunc(cfunc);
|
|
|
|
jfunc.setName(cfunc.getName());
|
|
|
|
jfunc.setType(JType.convert(cfunc.getType(), false));
|
|
|
|
|
|
|
|
int numArgs = cfunc.getNumArgs();
|
|
|
|
int numOffsets = 0;
|
|
|
|
for (int i = 0; i < numArgs; i++) {
|
|
|
|
CType cArgType = cfunc.getArgType(i);
|
|
|
|
if (cArgType.isTypedPointer() && useArray) {
|
|
|
|
++numOffsets;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < numArgs; i++) {
|
|
|
|
String cArgName = cfunc.getArgName(i);
|
|
|
|
CType cArgType = cfunc.getArgType(i);
|
|
|
|
|
|
|
|
jfunc.addArgument(cArgName, JType.convert(cArgType, useArray), i);
|
|
|
|
if (cArgType.isTypedPointer() && useArray) {
|
|
|
|
if (numOffsets > 1) {
|
|
|
|
jfunc.addArgument(cArgName + "Offset", new JType("int"), i);
|
|
|
|
} else {
|
|
|
|
jfunc.addArgument("offset", new JType("int"), i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return jfunc;
|
|
|
|
} catch (RuntimeException e) {
|
|
|
|
System.err.println("Failed to convert function " + cfunc);
|
|
|
|
throw e;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public String toString() {
|
|
|
|
String s = "Function " + fname + " returns " + ftype + ": ";
|
|
|
|
for (int i = 0; i < argNames.size(); i++) {
|
|
|
|
if (i > 0) {
|
|
|
|
s += ", ";
|
|
|
|
}
|
|
|
|
s += argTypes.get(i) + " " + argNames.get(i);
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|