David Turner
cb6dbb00ed
am e7e0e372: am b1bbce7c: am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
...
* commit 'e7e0e372a62ae7e77c477900e078027a272b6d33':
1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:31:22 -07:00
David Turner
a8c9a79640
am 2cdb34a2: am ddf8192f: am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
...
* commit '2cdb34a242d2a1767390301d04779f813b208cea':
1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:31:20 -07:00
David Turner
1d1f4c879b
am 4b0efb56: am 2abeceb7: am a80ddadf: Merge "remove NV_WAR defines"
...
* commit '4b0efb567936afdc46726fba606a7cba935427f8':
remove NV_WAR defines
2011-08-04 07:31:16 -07:00
David Turner
2d49928731
am f8e76503: am 3e6fbdd1: Merge "2.0 translator: link only if both shaders compile"
...
* commit 'f8e76503041d484703a1bb7a64f86b3fe4497393':
2.0 translator: link only if both shaders compile
2011-08-04 07:27:06 -07:00
David Turner
157fffcf18
am efdf94f7: am 0ecd4791: Merge "opengl translator: Added GLSL ES builtin constants."
...
* commit 'efdf94f7cc875f3dd66036f5962cf70802628ed1':
opengl translator: Added GLSL ES builtin constants.
2011-08-04 07:27:04 -07:00
David Turner
e7e0e372a6
am b1bbce7c: am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
...
* commit 'b1bbce7cc8cc8b8c38dedac62aa5190164ee1338':
1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:27:02 -07:00
David Turner
2cdb34a242
am ddf8192f: am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
...
* commit 'ddf8192faaae61b7d3b7a7cdad465e2f48974648':
1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:27:00 -07:00
David Turner
4b0efb5679
am 2abeceb7: am a80ddadf: Merge "remove NV_WAR defines"
...
* commit '2abeceb76408d8645836b3efe274de8c0c5b5d2d':
remove NV_WAR defines
2011-08-04 07:26:56 -07:00
David Turner
f8e7650304
am 3e6fbdd1: Merge "2.0 translator: link only if both shaders compile"
...
* commit '3e6fbdd1b286e09a153b68b74fb12bda9df9b0e8':
2.0 translator: link only if both shaders compile
2011-08-04 07:23:55 -07:00
David Turner
efdf94f7cc
am 0ecd4791: Merge "opengl translator: Added GLSL ES builtin constants."
...
* commit '0ecd4791c86d33497b89c104dc25e046ade033f9':
opengl translator: Added GLSL ES builtin constants.
2011-08-04 07:23:53 -07:00
David Turner
b1bbce7cc8
am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
...
* commit 'bcd5ebd98c203805c88eb5dad9edb0c24bbcee63':
1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:23:51 -07:00
David Turner
ddf8192faa
am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
...
* commit 'dba3c8bc91e634ae14ff2a5aef5ab41cecec2cc2':
1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:23:49 -07:00
David Turner
2abeceb764
am a80ddadf: Merge "remove NV_WAR defines"
...
* commit 'a80ddadf037e491c997b17da58ea08219eb21bd7':
remove NV_WAR defines
2011-08-04 07:23:46 -07:00
David Turner
3e6fbdd1b2
Merge "2.0 translator: link only if both shaders compile"
2011-08-04 07:10:38 -07:00
Amit Feller
25b3794419
2.0 translator: link only if both shaders compile
...
A program should be linked only if both vertex and fragment shaders
compiled succesfully.
Change-Id: I9793da85847fd606883e1e3bef05485ce6037c21
2011-08-04 16:10:12 +02:00
David Turner
0ecd4791c8
Merge "opengl translator: Added GLSL ES builtin constants."
2011-08-04 07:09:25 -07:00
David Turner
bcd5ebd98c
Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
2011-08-04 07:09:16 -07:00
David Turner
dba3c8bc91
Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
2011-08-04 07:09:06 -07:00
David Turner
a80ddadf03
Merge "remove NV_WAR defines"
2011-08-04 07:08:52 -07:00
Guy Zadickario
e8c7a055f7
opengl translator: Added GLSL ES builtin constants.
...
Adds GLSL built in constants defined in GLSL ES but not in GLSL.
Makes biConstant conformance test to pass on Mac (where ES2_compatability is not
present).
Also fixed the GLSL parser to insert our additions to the shader
only after the "#version" token if exist in the original shader.
Also renamed env var GOOGLE_GLES_FORCE_GLSL_VERSION to
GOOGLE_GLES_DEFAULT_GLSL_VERSION to better match its functionality since
we use it only if no specific version exist in the shader code.
Change-Id: If9485da16da2808245943a7295f8fb22a6f631aa
2011-08-04 12:01:49 +02:00
Yochai Shefi Simchon
7e04a2421c
1.1 translator: WAR for GL_ALPHA_TEST_REF bug
...
Both the ATI and nVidia OpenGL drivers return the wrong answer on
glGetIntegerv(GL_ALPHA_TEST_REF). So Implement this functionality
in our code.
Change-Id: I022b1475f7edb9f1d0f48ebcaf9f6e9f5c4f344e
2011-08-04 12:01:49 +02:00
Yochai Shefi Simchon
926db88dd1
1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
...
This is a WAR for an ATI OpenGL driver bug.
Change-Id: I0b54317873ed8c60fe835a993c2c8f32321ff8e2
2011-08-04 12:01:49 +02:00
Liran
ceb7fc9140
remove NV_WAR defines
...
enable workarounds by default
added environemnt variable GOOGLE_GLSL_FORCE_GLES_VERSION
to the shader parser
Change-Id: If1dbc10722436659295c40a40bd630a72e575799
2011-08-04 12:01:49 +02:00
Luca Zanolin
37a152d1ae
Merge "Show how to use broadcast for accessing voice search settings."
2011-08-04 02:51:50 -07:00
Luca Zanolin
50b7e75061
Show how to use broadcast for accessing voice search settings.
...
Change-Id: Ie17e377cd1814b58e00a56e8dfb84fc66cd88985
2011-08-04 09:50:21 +01:00
Xavier Ducrohet
d8245ecdb1
am e4354ba7: resolved conflicts for merge of d2819621 to honeycomb-plus-aosp
...
* commit 'e4354ba71e9ac21ff4e6864da7287db472c50e84':
move platform tools to r8.
2011-08-03 18:16:39 -07:00
Vladimir Chtchetkine
7c61dfc286
am dc6e4e64: am af0d8ed8: am 9a528ed9: Merge "Get rid of libqemu library."
...
* commit 'dc6e4e64de0036021dc4491ab0760d3aeb364019':
Get rid of libqemu library.
2011-08-03 18:16:37 -07:00
David Turner
8898d5da70
am 675845a4: am ecf74d6a: am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit '675845a4d26c8d718fa3c5a6b53b873c9ae01fc2':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 17:42:39 -07:00
David Turner
e70dc86f13
am fa00fd7e: am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit 'fa00fd7e18dcc15543fd2f12fb2b67c98b84b79c':
2.0 translator: workaround for nVidia "bug"
2011-08-03 17:42:37 -07:00
David Turner
237eb01363
am 42f7afd1: am 90b89c58: am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '42f7afd1c7db902d57525f09b6f26701b13cde90':
GLES2 translator: host does not support RGB565
2011-08-03 17:42:34 -07:00
David Turner
bf2a74e70c
am 3e06a6c4: am 4045962c: am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit '3e06a6c4dbafa0f2e2542a2b6175324f218ffa48':
GLES translator - enable binding to multiple texture targets
2011-08-03 17:42:31 -07:00
David Turner
05e78badcc
am 51fa07e1: am 659943e8: am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"
...
* commit '51fa07e1dad4c5407c739df71e3e4c8cf8c56e4b':
GLES2 translaotr: fix glLinkProgram and object names
2011-08-03 17:42:27 -07:00
Mark D Horn
36f0d56517
Fix size_t definition in x86 NDK header file
...
Bug: http://code.google.com/p/android/issues/detail?id=19011
The incorrect #define was being used which caused the incorrect
definition for size_t when the standalone toolchain is used.
Change-Id: Ifef4dc987c542a9c5d8bb43d84d3fe1431de9aa0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com >
2011-08-03 15:11:56 -07:00
Xavier Ducrohet
e4354ba71e
resolved conflicts for merge of d2819621 to honeycomb-plus-aosp
...
Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179
2011-08-03 13:47:37 -07:00
Vladimir Chtchetkine
dc6e4e64de
am af0d8ed8: am 9a528ed9: Merge "Get rid of libqemu library."
...
* commit 'af0d8ed819cf5eaf9b77bde80c0ef87a9d690d5d':
Get rid of libqemu library.
2011-08-03 12:44:08 -07:00
Xavier Ducrohet
d281962194
am c6d3e76d: Merge "move platform tools to r8."
...
* commit 'c6d3e76d5d6112a66c04f9e2fe6c2d610ee8702b':
move platform tools to r8.
2011-08-03 12:42:13 -07:00
Vladimir Chtchetkine
af0d8ed819
am 9a528ed9: Merge "Get rid of libqemu library."
...
* commit '9a528ed9845694e8fb73d263145786a6f549240d':
Get rid of libqemu library.
2011-08-03 12:42:10 -07:00
Xavier Ducrohet
c6d3e76d5d
Merge "move platform tools to r8."
2011-08-03 11:04:13 -07:00
Xavier Ducrohet
776387aa8f
Merge "Add all platform fonts to the SDK."
2011-08-03 11:03:41 -07:00
Vladimir Chtchetkine
9a528ed984
Merge "Get rid of libqemu library."
2011-08-03 10:51:07 -07:00
Vladimir Chtchetkine
b2b6f2f9da
Get rid of libqemu library.
...
Its implementation has been inlined in hardware/libhardware/include/hardware/qemu_pipe.h
Change-Id: I355764f87047c915ac43b85cd18bf0f27f06ede3
2011-08-03 09:10:14 -07:00
David Turner
675845a4d2
am ecf74d6a: am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit 'ecf74d6a25a9b4b93c22f2702b703d5e41acc81c':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 06:53:57 -07:00
David Turner
fa00fd7e18
am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit 'dedcb46019fae19d5f81f6924025e5ba54a1ec20':
2.0 translator: workaround for nVidia "bug"
2011-08-03 06:53:55 -07:00
David Turner
42f7afd1c7
am 90b89c58: am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '90b89c58a481b6eaef784181b03e213820e2824a':
GLES2 translator: host does not support RGB565
2011-08-03 06:53:52 -07:00
David Turner
3e06a6c4db
am 4045962c: am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit '4045962cca6f7b9f5a5f55197b62ad2332f479a7':
GLES translator - enable binding to multiple texture targets
2011-08-03 06:53:50 -07:00
David Turner
51fa07e1da
am 659943e8: am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"
...
* commit '659943e8a6001d8008005f1cbae738025854cfcc':
GLES2 translaotr: fix glLinkProgram and object names
2011-08-03 06:53:47 -07:00
David Turner
ecf74d6a25
am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit '47706d40ab7ceaac975bd7859258d8b4d5bc6c4a':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 06:50:31 -07:00
David Turner
dedcb46019
am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit '6707ea95bad94909787d56e8d855c9c45100e6ad':
2.0 translator: workaround for nVidia "bug"
2011-08-03 06:50:29 -07:00
David Turner
90b89c58a4
am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '1cd64c705cf8bbd9d6a6efdfa3daa593d066d1b8':
GLES2 translator: host does not support RGB565
2011-08-03 06:50:27 -07:00
David Turner
4045962cca
am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit 'bcfc7b17a0bd7feb90ab0c240864b6e1a5385f56':
GLES translator - enable binding to multiple texture targets
2011-08-03 06:50:25 -07:00