cba04990ec
Added parentheses around a few operators so that if they are used in a compound statement, order of operations is preserved.
...
BUG=5
TEST=OpenGL ES 2.0 conformance tests.
Review URL: http://codereview.appspot.com/1691041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@336 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-14 20:36:41 +00:00
334aa1f359
Handled case where selection nodes that use ternary operators are part of a sequence. Usually they are part of an assignment.
...
BUG=4
TEST=OpenGL ES 2.0 conformance tests, specifically operators test.
Review URL: http://codereview.appspot.com/1643043
git-svn-id: https://angleproject.googlecode.com/svn/trunk@335 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-11 23:38:29 +00:00
7d3849bd7c
Fix build when a project patch contains spaces
...
Trac #11553
With improvements so it works in release mode and on Win7 as well.
Original-Author: Jim Hauxwell
git-svn-id: https://angleproject.googlecode.com/svn/trunk@334 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-08 16:07:55 +00:00
306cc952a0
Workaround for drivers that apparently don't disable instancing when we ask.
...
TRAC #12479
This affects text rendering in Nexuiz.
The text will be drawn as if the colour attribute is static rather than array,
and all text will be drawn using the shadow colour.
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Andrew Lewycky
git-svn-id: https://angleproject.googlecode.com/svn/trunk@333 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-08 16:07:47 +00:00
1c233ff444
Increase the number of supported attribs (12) and texture units (16)
...
TRAC #12313
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@332 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-08 14:13:00 +00:00
b0a1dcccf6
Fix regression due to float printing changes
...
Trac #12501
This was caused by the change from printf to iostream printing.
Sets the float formatting to "default" which is neither fixed or scientific and request 8 digits of precision.
This appears to be mostly equivalent to the previous "%.8g".
If the non-fractional case, we set it to fixed and use 1 unit of precision after the decimal.
Signed-off-by: Andrew Lewycky
Signed-off-by: Shannon Woods
Signed-off-by: Ken Russell
git-svn-id: https://angleproject.googlecode.com/svn/trunk@331 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-07 02:06:26 +00:00
fce644e28e
Don't rely on (potentially) unsupported vertex attribute types.
...
TRAC #11391
Checks for optional vertex declaration formats and falls back to FLOAT1-4 if more direct formats are not supporte
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Andrew Lewycky
git-svn-id: https://angleproject.googlecode.com/svn/trunk@330 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-07 02:06:20 +00:00
a3bbfd43fe
Fixes double-decoration when getUniformLocation is called from defineUniform.
...
TRAC #12437
This fixes the WebGL Teapot Per Pixel sample rendering
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@329 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-07 02:06:09 +00:00
8f05d1aa87
Save D3D state before altering it for masked clears
...
TRAC #12380
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@328 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-07 02:06:03 +00:00
9c212cae5f
Fixed warnings in release build. Trace was not defined properly.
...
Review URL: http://codereview.appspot.com/1484041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@327 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-02 22:53:00 +00:00
84a9628864
Moved windows-only targets into OS==win conditional.
...
Review URL: http://codereview.appspot.com/1473043
git-svn-id: https://angleproject.googlecode.com/svn/trunk@325 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-02 22:26:52 +00:00
dd7948b3ae
According to spec, the stencil ref is clamped to the range [0,2^s-1]
...
The clamp to zero occurs on set since negative values will never be useful.
The clamp to 2^s - 1 occurs on use since it is dependant on the currently bound stencil buffer
Original-Author: Jim Hauxwell <james@dattrax.co.uk>
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@324 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-02 16:12:34 +00:00
91b7232040
Removed the dependency of compiler on common. This is done to make compiler self-sufficient so that it is easier to consume by external developers. I tried to replace all instances of assert by simply redefining assert(x) to ASSERT(x), but was getting a lot of compile errors. I still need to investigate that.
...
Review URL: http://codereview.appspot.com/1461041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@323 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-02 15:50:56 +00:00
4e4facd4a1
Refactored InfoSink. I have replaced most instances of sprintf with std::ostringstream to make it safer. I have made sure that everything still compiles and passes conformance tests.
...
Review URL: http://codereview.appspot.com/1391041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@322 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-06-02 15:21:22 +00:00
e37888d153
Add support for various egl Get methods
...
Trac #12375
This patch stores the current READ/DRAW and display in the context and
allows these eglGets to work.
Original-Author: Jim Hauxwell <james@dattrax.co.uk>
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@321 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-27 16:45:46 +00:00
5ac5dd25ae
Correct the eglMakeCurrent return value on lost context (syntax)
...
TRAC #11233
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@320 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-27 15:02:27 +00:00
561637aed1
Avoid using instancing on hardware where it does not work well enough.
...
TRAC #12392
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Andrew Lewycky
git-svn-id: https://angleproject.googlecode.com/svn/trunk@319 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-27 15:02:21 +00:00
13b2dd874a
Used "not" instead of "!" for vectors.
...
Review URL: http://codereview.appspot.com/1324041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@318 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-26 18:35:23 +00:00
d88b7736fc
Do not write extraneous semi-colons - some glsl compilers are do not like that even though it is so easy to ignore.
...
Review URL: http://codereview.appspot.com/1301041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@317 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-26 15:13:14 +00:00
90033b9eb5
ShInitialize/ShFinalize is designed to be called once per process, or it would crash at random locations. I changed ShFinalize() to properly cleanup and reset global variables so that they can be called multiple times. I think that the compiler setup is much more complicated than it needs to be. It unnecessarily uses global variables. A custom pool allocator is overkill too.
...
Review URL: http://codereview.appspot.com/1238045
git-svn-id: https://angleproject.googlecode.com/svn/trunk@316 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-24 15:02:43 +00:00
866f318d05
TextureColorbufferProxy must query the texture to get the latest width & height.
...
TRAC #12372
Signed-off-by: Daniel Koch
Author: Andrew Lewycky
git-svn-id: https://angleproject.googlecode.com/svn/trunk@315 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:28:22 +00:00
81655a720e
Use instancing for non-array vertex attributes.
...
TRAC #12303
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@314 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:18:17 +00:00
8c9ff193e3
Add Jim Hauxwell as a contributor
...
git-svn-id: https://angleproject.googlecode.com/svn/trunk@313 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:18:11 +00:00
b28a23bd8b
Fixes query for active texture
...
TRAC #12374
Original-Author: Jim Hauxwell <james@dattrax.co.uk>
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@312 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:18:06 +00:00
c6c6f0272d
Report an EGL_CONTEXT_LOST error on D3DERR_DEVICELOST
...
Trac #11233
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@311 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:18:00 +00:00
a2a95e7c9b
Implement scoped structure declarations
...
TRAC# 12110
Signed-off-by: Shannon Woods
Singed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@310 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:17:55 +00:00
8026c67712
Fixed struct name lexing
...
TRAC #12110
Unlike built-in types, structs can be redefined (in a different scope).
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@309 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:17:48 +00:00
838bceaee2
Detect draws that would read outside the vertex buffer.
...
TRAC #12340
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Andrew Lewycky
git-svn-id: https://angleproject.googlecode.com/svn/trunk@308 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:17:42 +00:00
8b9f4cc8d0
Fix FORCE_REF_RAST definition
...
TRAC #12343
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@307 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:17:35 +00:00
741a588e70
Add defines to enable the reference rasterizer
...
TRAC #12343
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@306 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-20 19:17:29 +00:00
89b054348c
Fixed compile error with gcc 4.4.
...
TBR=gman@chromium.org
Review URL: http://codereview.appspot.com/1199047
git-svn-id: https://angleproject.googlecode.com/svn/trunk@305 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-19 20:13:10 +00:00
1bcc3fd599
Patching changes from thestig@chromium.org for fixing ANGLE build with gcc 4.4 on Karmic. The original CL is here: http://codereview.appspot.com/1255042/show
...
The only changes I have maded is moved the inclusion of stdint.h from PoolAlloc.h to PoolAlloc.cpp with #ifndef _MSC_VER guard.
Review URL: http://codereview.appspot.com/1220044
git-svn-id: https://angleproject.googlecode.com/svn/trunk@304 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-19 17:08:44 +00:00
5d4c28f9d5
Removes check for framebuffer == 0 in glRenderbufferStorage
...
TRAC #12346
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@303 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-19 07:14:19 +00:00
178adff757
Give sorted configs a unique ID without changing the original set
...
TRAC #12323
This fixes building on Visual C++ 2010, which has const iterators for STL sets as specified by C++0x.
Signed-off-by: Shannon Woods
Singed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@302 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:52:04 +00:00
cd0a9a888b
Define GL_FRAGMENT_PRECISION_HIGH
...
TRAC #12266
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@301 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:59 +00:00
e0d7d43460
Fix DepthRange location
...
TRAC #12279
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@300 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:52 +00:00
defa1c39ac
Use plain data arrays for Buffer storage
...
TRAC #12299
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@299 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:45 +00:00
91fd1de6bb
Caches the location of generic uniforms
...
TRAC #12215
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@298 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:40 +00:00
15a4d2ef5a
Explicitly set optimizations to /O2 in Release build
...
TRAC #12287
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@297 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:34 +00:00
5a722c7fad
Disable checked STL iterators in Release build
...
TRAC #12287
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@296 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:26 +00:00
e7273f4ed0
Inline any suitable function in Release build
...
TRAC #12287
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@295 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:17 +00:00
a36f98efb5
Correct GLboolean handling for glColorMask and glSampleCoverage
...
TRAC #11597
Signed-off-by: Shannon Woods
Signed-off-bY: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@294 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-18 18:51:09 +00:00
a5d7623d59
Enforce fragment precision qualifier requirement
...
TRAC #12156
The fragment shader has no default precision qualifier for floating-point types,
so compilation should fail when it's not set explicitly globally or per declaration.
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@293 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-17 09:58:47 +00:00
0578f81c9a
Untabify compiler code
...
TRAC #12156
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@292 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-17 09:58:39 +00:00
0a311a467c
ensure mBaseTexture is initialized
...
Trac #12298
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@291 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-17 09:58:33 +00:00
d08ea900b6
Reduces STL size calls.
...
TRAC #12281
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@290 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-14 19:41:36 +00:00
4e89d233e5
Cleaned up Common.h. Removed unnecessary includes and typedefs. Removed tabs from PoolAlloc.h and replaced UINT_PTR with uintptr_t.
...
Review URL: http://codereview.appspot.com/1221041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@289 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-14 19:37:21 +00:00
cff1aff5dd
Fixed compile error on a few linux buildbots. Included string.h for memset.
...
Review URL: http://codereview.appspot.com/1218041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@288 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-14 19:24:22 +00:00
2b7ebdb942
Switches stl copy in bufferSubData for a memcpy
...
TRAC #12215
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@287 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-14 17:31:24 +00:00
202ff653bc
Caches parameters for SetStreamSource calls
...
TRAC #12239
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@286 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-05-14 17:31:19 +00:00
alokp@chromium.org
daniel@transgaming.com