Commit Graph

349 Commits

Author SHA1 Message Date
Android (Google) Code Review
c5a8dd2f82 Merge change 271
* changes:
  Manually merge 129, 174, and 233 from donut
2009-04-17 11:04:03 -07:00
Jack Palevich
412f38f270 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-17 10:32:56 -07:00
Android (Google) Code Review
f8c4464414 Merge change 164
* changes:
  Use lower case mime type, encoding, and transfer encoding.
2009-04-17 05:26:25 -07:00
Dave Sparks
0eb6d6e33d Merge branch 'readonly-p4-donut' into donut 2009-04-16 19:55:31 -07:00
Android (Google) Code Review
cb19163660 Merge change 233 into donut
* changes:
  Add an Android-specific static OpenGL ES 1.1 Java API.
2009-04-16 17:55:44 -07:00
Dave Sparks
658c6a1347 Merge branch 'readonly-p4-donut' into donut 2009-04-16 17:51:48 -07:00
Jack Palevich
427f585f72 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-16 15:20:55 -07:00
Brandon Ballinger
db3095c118 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Dirk Dougherty
1ce38018f9 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:29:31 -07:00
Dirk Dougherty
73bca2e954 Merge branch 'readonly-p4-donut' into donut 2009-04-16 13:35:30 -07:00
Ramanan Rajeswaran
519b9c52c1 Merge branch 'readonly-p4-master' 2009-04-16 12:48:12 -07:00
Xavier Ducrohet
9a4ec0a034 Merge branch 'readonly-p4-donut' into donut 2009-04-16 12:45:54 -07:00
Ramanan Rajeswaran
3628d1d00d Merge branch 'readonly-p4-master' 2009-04-16 12:42:17 -07:00
Scott Main
19caa910f3 Merge branch 'readonly-p4-master' 2009-04-16 11:43:01 -07:00
Android (Google) Code Review
afac476f5b Merge changes 222,223,227
* changes:
  update onCreate method to work around InstrumentationTestRunner limitation.
  Removing unused StreamPipe class, also stripping some white spaces
  * Update the way that run_page_cycler.py detectes instrumentation failures. * Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
2009-04-16 11:12:33 -07:00
Android (Google) Code Review
4f33a4c871 Merge change 219
* changes:
  Fix a null pointer exception in DumpRenderTree (issue 1792567)
2009-04-16 11:11:14 -07:00
Robert Greenwalt
fd25425797 Merge branch 'readonly-p4-master' 2009-04-16 11:07:25 -07:00
Ramanan Rajeswaran
225b75ca30 Merge branch 'readonly-p4-master' 2009-04-16 10:49:44 -07:00
Android (Google) Code Review
5c6e70f655 Merge change 195
* changes:
  Make webkit's cursor draw at the correct times.
2009-04-16 06:21:10 -07:00
Android (Google) Code Review
753b1c74e9 Merge change 187 into donut
* changes:
  replaced integer * and % with shift operations, for performance
2009-04-16 00:05:57 -07:00
Android (Google) Code Review
f6a56f6813 Merge change 186 into donut
* changes:
  eliminate seemingly pointless conversion to and then from hex string
2009-04-15 12:13:07 -07:00
Dirk Dougherty
9a081ce2ca Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:35:03 -07:00
Dirk Dougherty
72362b79bc Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:32:07 -07:00
Android (Google) Code Review
f6aed0365c Merge change 190 into donut
* changes:
  location: Move geocoding support from ILocationProvider to a new interface.
2009-04-15 08:21:40 -07:00
Eric Shienbrood
af43695f97 Merge branch 'readonly-p4-master' 2009-04-15 06:59:53 -07:00
Android (Google) Code Review
f32a863262 Merge change 174 into donut
* changes:
  Improve glgen
2009-04-15 06:14:11 -07:00
Android (Google) Code Review
65943af798 Merge change 175 into donut
* changes:
  telephony: Don't disable an APN type that is not enabled.
2009-04-14 20:19:42 -07:00
Jack Palevich
ffac1eff58 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.
2009-04-14 19:00:09 -07:00
Scott Main
5eb4852639 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:23:06 -07:00
Scott Main
151414fed9 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:02:10 -07:00
Guang Zhu
1c7ce8787d Merge branch 'readonly-p4-donut' into donut 2009-04-14 16:47:03 -07:00
Eric Shienbrood
240a001160 Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Android (Google) Code Review
6f6fcc2afa Merge changes 108,130,131 into donut
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
3cc9a57fe9 Merge change 109 into donut
* changes:
  Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Yu Shan Emily Lau
7b624ffa05 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Android (Google) Code Review
4dc58eb1b7 Merge change 129 into donut
* changes:
  Clean up trivial Eclipse warnings and fix whitespace.
2009-04-14 14:15:22 -07:00
Android (Google) Code Review
aa913f65ce Merge change 154 into donut
* changes:
  gps: Add support for bringing up a GSM data connection on demand for SUPL.
2009-04-14 13:36:33 -07:00
Android (Google) Code Review
609901a028 Merge change 133 into donut
* changes:
  Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Android (Google) Code Review
8c7acbe3e4 Merge change 132 into donut
* changes:
  Let's do bug #1769910 actually right.
2009-04-14 13:15:43 -07:00
Android (Google) Code Review
3fcff1d7a4 Merge change 142 into donut
* changes:
  telephony: Add support for bringing up GSM data connections for GPS SUPL.
2009-04-14 12:52:28 -07:00
Dan Bornstein
a2aef005fc Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Brett Chabot
7d6daac1a1 Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Lorenzo Colitti
4680ab625f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Leon Scroggins
56eccb2855 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Android (Google) Code Review
11b61b471f Merge change 79
* changes:
  Squashed commit of the following:
2009-04-14 11:54:14 -07:00
Leon Scroggins
b52d5323ea Merge branch 'readonly-p4-master' 2009-04-14 11:07:14 -07:00
Ramanan Rajeswaran
34dd8b0422 Merge branch 'readonly-p4-donut' into donut 2009-04-14 11:07:13 -07:00
Ramanan Rajeswaran
f903a0e151 Merge branch 'readonly-p4-donut' into donut 2009-04-14 09:48:58 -07:00
Ramanan Rajeswaran
e86ac7cf26 Merge branch 'readonly-p4-donut' into donut 2009-04-14 09:34:58 -07:00
Android (Google) Code Review
519e83f566 Merge change 105 into donut
* changes:
  Fix crash when mSST is null and change default to GSM.
2009-04-13 21:37:13 -07:00