OSDN Git Service
Greg Hartman [Tue, 31 Mar 2015 23:01:46 +0000 (16:01 -0700)]
On Android: remove fallbacks that can match system libraries
Change-Id: Ieb57c03730387f04a339c2b19a7e59beb4408d19
Reviewed-on: https://swiftshader-review.googlesource.com/2770
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Nicolas Capens [Wed, 1 Apr 2015 14:54:59 +0000 (10:54 -0400)]
Move the code generation mutex to Reactor.
Generation of the routines for copying surfaces and blitting
were not protected by the same critical section as the renderer.
Change-Id: I10eb386bdeebb04abc999b3313dc2c3b52adc090
Reviewed-on: https://swiftshader-review.googlesource.com/2772
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Wed, 1 Apr 2015 15:45:36 +0000 (11:45 -0400)]
Possibility to call a non-existing display list without error
Change-Id: I13fba44145d378470f2090f7688a8dd68ae56452
Reviewed-on: https://swiftshader-review.googlesource.com/2773
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Tue, 31 Mar 2015 15:48:57 +0000 (11:48 -0400)]
Replacing numbers by constants
In order to be able to easily modify
values in between OpenGL ES versions,
some constants were added to replace
hardcoded numbers.
Change-Id: Ic35bf8e45341addf5315acaa9ffac01095b8907c
Reviewed-on: https://swiftshader-review.googlesource.com/2761
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Nicolas Capens [Sun, 29 Mar 2015 04:27:33 +0000 (00:27 -0400)]
Use matching internal and external formats for RGBA8 images.
Change-Id: I056e1a4c7ace83207bed85ce28aca187d72adc6f
Reviewed-on: https://swiftshader-review.googlesource.com/2757
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sun, 29 Mar 2015 02:01:42 +0000 (22:01 -0400)]
Implement glReadPixels() for RGBA formats.
Change-Id: Ia2f7d1db3b2a0f075326c3331125ca347f42932d
Reviewed-on: https://swiftshader-review.googlesource.com/2756
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sun, 29 Mar 2015 01:48:51 +0000 (21:48 -0400)]
Enable using RGBA as internal formats.
Change-Id: Ied6d934f67c05c02bf75e99ab5e58bfd3b9070e6
Reviewed-on: https://swiftshader-review.googlesource.com/2755
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sat, 28 Mar 2015 22:57:56 +0000 (18:57 -0400)]
Implement support for RGBA blitting.
Change-Id: I1ad9fed9aea34cd20f8d78f4d4469c61aeb00ea6
Reviewed-on: https://swiftshader-review.googlesource.com/2753
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sat, 28 Mar 2015 22:54:07 +0000 (18:54 -0400)]
Implement support for RGBA render targets.
Change-Id: I0b903412c86442f3aca5dc454956c8d46b467083
Reviewed-on: https://swiftshader-review.googlesource.com/2752
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sat, 28 Mar 2015 22:44:48 +0000 (18:44 -0400)]
Implement support for RGBA sampling.
Also improve the filtering precision of 3-byte formats.
Change-Id: If314c870735488dfcd22b9ab60b4783e31a4c05b
Reviewed-on: https://swiftshader-review.googlesource.com/2751
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Mon, 30 Mar 2015 14:52:47 +0000 (10:52 -0400)]
Adding uniform related APIs for GLES3
- Added NxM size matrices
- Added unsigned int uniforms
- Removed dead code(packVaryings) in Program
Change-Id: I0ecb47fa468245f60b9aa026d07fa9ed1f871340
Reviewed-on: https://swiftshader-review.googlesource.com/2745
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Sun, 22 Mar 2015 05:45:06 +0000 (22:45 -0700)]
Implement basic ANDROID_image_native_buffer support.
Change-Id: I7e844eb7c313455d48cd2fc09440f10d639b4c77
Reviewed-on: https://swiftshader-review.googlesource.com/2758
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Ping-Hao Wu <pinghao@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sat, 28 Mar 2015 01:47:49 +0000 (21:47 -0400)]
Implement support for RGBA display formats.
Change-Id: I5d9c9567d6885a2c3bbaf78a821f66f99b1bfcfe
Reviewed-on: https://swiftshader-review.googlesource.com/2750
Reviewed-by: Ping-Hao Wu <pinghao@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Mon, 23 Mar 2015 19:34:43 +0000 (15:34 -0400)]
Adding trace and more verifications to new ES3 APi functions
- Added missing TRACE macros
- Added some trivial verifications in a few more functions
Change-Id: I32762a5caf8ee086ee423ba39a077d3cf3ec543a
Reviewed-on: https://swiftshader-review.googlesource.com/2683
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 27 Mar 2015 18:04:01 +0000 (11:04 -0700)]
Added missing stride value.
Change-Id: I5931d9284e4e4b0649ceb38df6c5947efb1ca7d0
Reviewed-on: https://swiftshader-review.googlesource.com/2741
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Ping-Hao Wu [Thu, 26 Mar 2015 22:44:07 +0000 (15:44 -0700)]
Add missing external texture type to the sampler uniforms.
Change-Id: I6954c992401bca495df3808603fba1bb5ecb8a60
Reviewed-on: https://swiftshader-review.googlesource.com/2740
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 25 Mar 2015 18:03:21 +0000 (14:03 -0400)]
Implement EGL_SWAP_BEHAVIOR for eglSurfaceAttrib().
SwiftShader currently always preserves the color buffer on eglSwapBuffers,
so both EGL_BUFFER_PRESERVED and EGL_BUFFER_DESTROYED can be used without
real changes.
Change-Id: I55fcd7d4b4211483d8876c15d3d6ea77ea2685e6
Reviewed-on: https://swiftshader-review.googlesource.com/2721
Reviewed-by: Ping-Hao Wu <pinghao@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 20 Mar 2015 17:34:51 +0000 (13:34 -0400)]
Add a critical section for dynamic code generation.
Bug
19864302
Change-Id: Iaca49fa72146ff35b6f1e5e40ade5cd2c5c48d0e
Reviewed-on: https://swiftshader-review.googlesource.com/2657
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:05:34 +0000 (13:05 -0700)]
Android FrameBuffer implementation.
Change-Id: I95356056e7785e2dcfeffa95d4a38cc4e113ec62
Reviewed-on: https://swiftshader-review.googlesource.com/2661
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Nicolas Capens [Wed, 25 Mar 2015 15:05:04 +0000 (11:05 -0400)]
Implement basic GL_OES_draw_texture functionality.
Change-Id: If242cfd4df1a7519152946b3d2364fc180f8ffae
Reviewed-on: https://swiftshader-review.googlesource.com/2720
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Mon, 23 Mar 2015 22:28:19 +0000 (15:28 -0700)]
Turn on tracing on Android by default.
Log errors on UNIMPLEMENTED() rather than aborting.
For now ASSERT() will still abort.
Change-Id: I4db66934d0cd69b557fd2989e0c120a5fa372b99
Reviewed-on: https://swiftshader-review.googlesource.com/2691
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 20:15:56 +0000 (13:15 -0700)]
dlopen() has no NO_LOAD option before Android L.
This change could result in multiple instances of the shared library being
loaded when using alternate paths. This will be addressed by b/
18752589.
Change-Id: Icf26a0c6f76edfd4f1c710e14f1005138d97e77a
Reviewed-on: https://swiftshader-review.googlesource.com/2664
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Nicolas Capens [Tue, 24 Mar 2015 20:59:26 +0000 (16:59 -0400)]
Implement glTexEnvx().
All current texture environment parameters are integer, so just pass them
through to glTexEnvi().
Change-Id: I2f1abea0d6da0e76b7ef305588ffc65fead32502
Reviewed-on: https://swiftshader-review.googlesource.com/2701
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 24 Mar 2015 20:37:08 +0000 (16:37 -0400)]
Implement glTexParameterx().
All current texture parameters are integer, so just pass them through to
glTexParameteri().
Change-Id: Ic4042b26b31194916af7814cabf2eb0d22c76ecb
Reviewed-on: https://swiftshader-review.googlesource.com/2710
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 24 Mar 2015 20:06:53 +0000 (16:06 -0400)]
Implement glShadeModel() for OpenGL ES 1.1.
Change-Id: I9b360f92c0b93a854abfd686cdcdd9b2a1dd6a13
Reviewed-on: https://swiftshader-review.googlesource.com/2700
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:25:37 +0000 (13:25 -0700)]
Add support for Android window size.
Change-Id: Ib96c227367fe10890e576bf99a654b50fa9e06c4
Reviewed-on: https://swiftshader-review.googlesource.com/2671
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:29:14 +0000 (13:29 -0700)]
Update paths for the Android shared libraries
Change-Id: I41f663cc72709300ef59c1663ff0e44555afede8
Reviewed-on: https://swiftshader-review.googlesource.com/2672
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Greg Hartman [Mon, 23 Mar 2015 22:10:11 +0000 (15:10 -0700)]
Pull in a #include to get std::size_t for Android GCE K
Change-Id: Ia2e2550fd333a3fd221ff4f8a5f46c215ca66be3
Reviewed-on: https://swiftshader-review.googlesource.com/2690
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Greg Hartman [Sun, 22 Mar 2015 19:12:22 +0000 (12:12 -0700)]
Connect tracing and logcat
Change-Id: Icb27a7f83b44a1081cae2db15ac43c025a4d04fc
Reviewed-on: https://swiftshader-review.googlesource.com/2681
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Nicolas Capens [Fri, 13 Mar 2015 21:59:58 +0000 (17:59 -0400)]
Work around non-compliant behavior for Google Maps.
Bug
18703920
Change-Id: Ifde19f323e4025e2fd2ce24056e38073e373feb3
Reviewed-on: https://swiftshader-review.googlesource.com/2300
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Mon, 23 Mar 2015 20:47:22 +0000 (16:47 -0400)]
Enable the use of samplerExternalOES.
Change-Id: Iabafc06d073c99f9cc5b2c62ed83eff4862bc2cc
Reviewed-on: https://swiftshader-review.googlesource.com/2684
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Tue, 10 Mar 2015 19:04:37 +0000 (12:04 -0700)]
Ignore files generated by Code::Blocks
Change-Id: I8a5763e8c0fbc2ce788871c18e36f2af7768832c
Reviewed-on: https://swiftshader-review.googlesource.com/2540
Tested-by: Ping-Hao Wu <pinghao@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 20 Mar 2015 20:21:57 +0000 (13:21 -0700)]
Wait for threads to exit when destroying them.
Bug
19868861
Android does not support canceling threads, but we shouldn't forcefully
destroy them anyway, and we already join() all threads before deleting
them. So use the same semantics on all platforms and join redundantly.
Change-Id: I888e2e64288cf3ac53d570d517f3e0867b8c479e
Reviewed-on: https://swiftshader-review.googlesource.com/2667
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:24:30 +0000 (13:24 -0700)]
Indicate support for Android EGL surface config attributes.
Change-Id: Id26f96448c976bedab200713cefa168747251211
Reviewed-on: https://swiftshader-review.googlesource.com/2670
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Mon, 23 Mar 2015 05:56:39 +0000 (01:56 -0400)]
Use sched_yield() instead of pthread_yield().
pthread_yield() is non-standard and not available on Android.
shed_yield() is a POSIX standard function.
Change-Id: I093047031dd0b35a28724540aaddeb3f5ba849bc
Reviewed-on: https://swiftshader-review.googlesource.com/2682
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 20:06:11 +0000 (13:06 -0700)]
LLVM configuration for Android builds.
Change-Id: I788c00ebeef3fa472ebe157cb1cd783a6571b95c
Reviewed-on: https://swiftshader-review.googlesource.com/2662
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 20:07:32 +0000 (13:07 -0700)]
Android's Bionic doesn't support std::sprintf.
Even though the Windows COFF format should not be needed at all on Android,
the dependencies on this file are too entangled.
Change-Id: I7561a1a037cbc8841a6991b5f3beee3a059ad89d
Reviewed-on: https://swiftshader-review.googlesource.com/2663
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:04:51 +0000 (13:04 -0700)]
Makefiles for Android integration.
Change-Id: I0bca36fe330c910dc19c12673846797b6cb4aeea
Reviewed-on: https://swiftshader-review.googlesource.com/2660
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 20 Mar 2015 20:23:01 +0000 (13:23 -0700)]
Remove symbols not available on Android
Change-Id: I35296240662157fb4d0172fd386d82ab038634ca
Reviewed-on: https://swiftshader-review.googlesource.com/2668
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Greg Hartman [Fri, 20 Mar 2015 20:23:26 +0000 (13:23 -0700)]
Remove uninformative error message details on division by zero.
Android does not support operator<< for long long. Instead of trying to use a
supported type, we noticed that this error adds very little value so remove it
wholesale.
Change-Id: Id0c15a24f7a609bb6e61a4d0b9816eec80ffc1cf
Reviewed-on: https://swiftshader-review.googlesource.com/2669
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 20:21:28 +0000 (13:21 -0700)]
Add missing virtual destructors.
Polymorphic classes should have virtual destructors.
Change-Id: Ia3c8e48b43ff96df9b9db2e4742fabcbd13ee853
Reviewed-on: https://swiftshader-review.googlesource.com/2666
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 20:19:01 +0000 (13:19 -0700)]
Added missing header
Change-Id: Ibc44597e6c4c07686dfc775cff9877e417c66542
Reviewed-on: https://swiftshader-review.googlesource.com/2665
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 15:41:49 +0000 (11:41 -0400)]
Use a string format for safer printing.
The string was directly used as the string format, which would have caused
printf to expect additional arguments when it contains formatting elements.
Bug
18720257
Change-Id: Ie4391097e58d4cab2793a05eda2b03acd02d7f22
Reviewed-on: https://swiftshader-review.googlesource.com/2656
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Ping-Hao Wu [Fri, 20 Mar 2015 15:10:11 +0000 (11:10 -0400)]
Remove unnecessary <exception> includes.
Bug
18720257
Change-Id: I33917bedd2861b64ca0480b66861b2a25451188c
Reviewed-on: https://swiftshader-review.googlesource.com/2655
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Thu, 12 Mar 2015 21:33:07 +0000 (17:33 -0400)]
Implement simple OpenGL ES 3.0 parameter checks
Added some "low hanging fruit" implementations and quick validation
checks for a portion of the GLES 3.0 API functions.
Change-Id: I003031091bc2c2c32919896e86e38b5f1f43c555
Reviewed-on: https://swiftshader-review.googlesource.com/2610
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 12 Mar 2015 02:11:49 +0000 (22:11 -0400)]
Use a common implementation of the matrix stack for fixed-function OpenGL.
Change-Id: Ie51cddb3465f72375f20c704293d0850c95a735b
Reviewed-on: https://swiftshader-review.googlesource.com/2600
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 12 Mar 2015 01:49:44 +0000 (21:49 -0400)]
Implement glFrustum() for OpenGL ES 1.1.
Change-Id: Iedf1f5d64a3346a0b4cf081cfcd383c8dc67b775
Reviewed-on: https://swiftshader-review.googlesource.com/2590
Reviewed-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Wed, 4 Mar 2015 19:44:36 +0000 (14:44 -0500)]
libGL Frustum implementation
Change-Id: I3ffce981fd8238ca1767e05929da3502cd3b2a39
Reviewed-on: https://swiftshader-review.googlesource.com/2510
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Wed, 4 Mar 2015 19:51:58 +0000 (14:51 -0500)]
libGL MultMatrixd implementation
Change-Id: Ia1bbe00c9538403b59c2960558b94bd4e7327189
Reviewed-on: https://swiftshader-review.googlesource.com/2520
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Wed, 18 Feb 2015 18:38:12 +0000 (13:38 -0500)]
Replaced fopen every trace call by a single fopen when tracing/dumping data
Change-Id: If752b2db0f3bd7125508b88f32248af6fa3c598d
Reviewed-on: https://swiftshader-review.googlesource.com/2340
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Tue, 10 Mar 2015 20:42:04 +0000 (16:42 -0400)]
Adding some GLES 3.0 specific enums
This cl doesn't actually do anything, but we need to establish
exactly how to add new GLES 3.0 specific cases in Swift Shader.
Change-Id: I7f31ea98e0d24f71204a3e1a7a31bf3379741e15
Reviewed-on: https://swiftshader-review.googlesource.com/2560
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Nicolas Capens [Thu, 26 Feb 2015 18:16:00 +0000 (13:16 -0500)]
Constant function parameters are not constant expressions.
Bug
19511934
Change-Id: I367a92ac0594d2bba91e26efe5c5af7dbe6f0d04
Reviewed-on: https://swiftshader-review.googlesource.com/2480
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Mon, 23 Feb 2015 19:23:11 +0000 (14:23 -0500)]
Always show the FPS when SwiftConfig is active.
Change-Id: Iec5aff6d73f9e20ba4bc6a95bc1e07d5e7b5930e
Reviewed-on: https://swiftshader-review.googlesource.com/2490
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 26 Feb 2015 18:14:27 +0000 (13:14 -0500)]
Rename EvqConst to EvqConstExpr
In GLSL ES a variable declared const is a compile-time constant, and
thus a constant expression. Parameters declared const are read-only but
not compile-time constant.
Bug
19511934
Change-Id: I6d02062ca62c4185a3384b31a4d3ce8dfcc86b35
Reviewed-on: https://swiftshader-review.googlesource.com/2441
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Mon, 2 Mar 2015 16:17:58 +0000 (11:17 -0500)]
Fix Clang compilation.
Change-Id: I127217b26f95598ae6debd8b8b898c200d310135
Reviewed-on: https://swiftshader-review.googlesource.com/2500
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 24 Feb 2015 22:38:08 +0000 (17:38 -0500)]
Set symbol extension at insertion.
Bug
19331817
Change-Id: Ia501eba1b17406db4dcb464d862ce7d4ccacf236
Reviewed-on: https://swiftshader-review.googlesource.com/2392
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 24 Feb 2015 22:35:47 +0000 (17:35 -0500)]
Set symbol operations at insertion.
Bug
19331817
Change-Id: I93eb70d05b2c389cd751519bc43eb6f256e8e4a6
Reviewed-on: https://swiftshader-review.googlesource.com/2391
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 19 Feb 2015 20:53:16 +0000 (15:53 -0500)]
Use generic types to compact the symbol table initialization.
Bug
19331817
Change-Id: I6ec0f8c6f2ef61f3d0d5adb627eab4a29dffc8ac
Reviewed-on: https://swiftshader-review.googlesource.com/2380
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 19 Feb 2015 20:53:16 +0000 (15:53 -0500)]
Use safer typed enums.
Bug
19331817
Change-Id: I75787c6a9df3bca539dcaf3a1d3f0e49994c73b4
Reviewed-on: https://swiftshader-review.googlesource.com/2390
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Alexis Hetu [Wed, 11 Feb 2015 15:31:58 +0000 (10:31 -0500)]
Adding multisampling to texture3D test
Required adding X and Y flipping to blitter.
Change-Id: Icaac4045ae9419296112464d7ccdde7babb76eb3
Reviewed-on: https://swiftshader-review.googlesource.com/2180
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 22:53:39 +0000 (17:53 -0500)]
Implement basic GLSL ES 3.0 texture sampling.
Bug
19331817
Change-Id: Ieb4581c62525112e0b76e94bcbbb8f9608c782ea
Reviewed-on: https://swiftshader-review.googlesource.com/2371
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 22:30:46 +0000 (17:30 -0500)]
Define GLSL ES 3.0 sampler types.
Bug
19331817
Change-Id: I7f7f842d01069abda953a5fe3eb8572f5dc985a9
Reviewed-on: https://swiftshader-review.googlesource.com/2370
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 21:58:10 +0000 (16:58 -0500)]
Simplify the creation of global types.
Bug
19331817
Change-Id: I6e288f5385887afce7c7affc13431277b379fdc3
Reviewed-on: https://swiftshader-review.googlesource.com/2363
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 21:34:50 +0000 (16:34 -0500)]
Move GLSL ES 1.00-specific symbols to their own symbol level.
Bug
19331817
Change-Id: I00abb7635e7a232891dd158b472c375d931db584
Reviewed-on: https://swiftshader-review.googlesource.com/2362
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 20:30:51 +0000 (15:30 -0500)]
Split builtin symbols over multiple levels.
Bug
19331817
Change-Id: Ia1ab8f4da90c62ca846961c97691aacdbdf62a6a
Reviewed-on: https://swiftshader-review.googlesource.com/2361
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 19:52:21 +0000 (14:52 -0500)]
Explicitly insert builtins at symbol level 0 and declare variables at the top level.
Bug
19331817
Change-Id: I157c68e00aef3f2726bd72ac7ff96bdb8f191c75
Reviewed-on: https://swiftshader-review.googlesource.com/2350
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 18 Feb 2015 19:47:31 +0000 (14:47 -0500)]
Pass the shader version to the symbol table.
This refactoring prepares for version-specific builtin symbol lookups.
Bug
19331817
Change-Id: I65b46a2b35872802a249a45b2f97a1d3c1e35dfe
Reviewed-on: https://swiftshader-review.googlesource.com/2330
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 22:58:31 +0000 (17:58 -0500)]
Implement support for layout qualifier locations.
Bug
19331817
Change-Id: I98c650311c6226bf769bc9f3c2eed8dac788a396
Reviewed-on: https://swiftshader-review.googlesource.com/2320
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 22:30:04 +0000 (17:30 -0500)]
Add support for unsigned integer literals in the shading language.
Bug
19331817
Change-Id: I5a4a3f7aba4f758a3e8b4b5ff7c09e26bc9b7430
Reviewed-on: https://swiftshader-review.googlesource.com/2314
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 22:26:01 +0000 (17:26 -0500)]
Implement shader compiler support for uint vectors.
Bug
19331817
Change-Id: Ib85c82f7490a5e48830fb496cddbb5aa6837dfb2
Reviewed-on: https://swiftshader-review.googlesource.com/2313
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 22:17:20 +0000 (17:17 -0500)]
Implement shader compiler support for uint scalars.
Bug
19331817
Change-Id: Ie901756ef4fdbab1dfa6ae01c77104fc84de247f
Reviewed-on: https://swiftshader-review.googlesource.com/2312
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 20:11:30 +0000 (15:11 -0500)]
Add helper functions to the lexer to tokenize strings that have different classifications in ES2 and ES3.
Bug
19331817
Change-Id: I4e1c190e23aa63b03ef8f57930102d01e496f107
Reviewed-on: https://swiftshader-review.googlesource.com/2311
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 17 Feb 2015 17:42:14 +0000 (12:42 -0500)]
Support in/out as type qualifiers.
Bug
19331817
Change-Id: Iab11050d27e02003fbfcfbe0f47052d73043cfd4
Reviewed-on: https://swiftshader-review.googlesource.com/2310
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Sun, 15 Feb 2015 19:25:37 +0000 (14:25 -0500)]
Add support for new ESSL 3.00 keywords.
Bug
19331817
Change-Id: I3315de44d1976219fada3013af13146433aa6eaa
Reviewed-on: https://swiftshader-review.googlesource.com/2100
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 13 Feb 2015 21:39:30 +0000 (16:39 -0500)]
Reject GLSL ES 3.00 shaders for OpenGL ES 2.0 contexts.
Bug
19331817
Change-Id: I72128c6b3cb672d4b74578086814fde2c2c6db99
Reviewed-on: https://swiftshader-review.googlesource.com/2292
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 13 Feb 2015 21:32:07 +0000 (16:32 -0500)]
Use an STL string for the shader info log.
Bug
19331817
Change-Id: I9ea2f823fafa54e598e79181aa39c3626d9dc4e8
Reviewed-on: https://swiftshader-review.googlesource.com/2291
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 13 Feb 2015 21:09:11 +0000 (16:09 -0500)]
Centralize shader compilation.
Bug
19331817
Change-Id: Ib5df377bf8f715e008f9d4e5efd0e97c6e2f2570
Reviewed-on: https://swiftshader-review.googlesource.com/2290
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 13 Feb 2015 21:06:45 +0000 (16:06 -0500)]
Eliminate compiling for the WebGL spec.
Bug
19331817
Change-Id: I85cbfd61a267e39832b951121422a676f5af4a54
Reviewed-on: https://swiftshader-review.googlesource.com/2289
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 20:23:06 +0000 (15:23 -0500)]
Parse the shader version number.
Bug
19331817
Change-Id: I53f24cec92052eb7367219c299222b02301f3a19
Reviewed-on: https://swiftshader-review.googlesource.com/2288
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 11 Feb 2015 22:40:30 +0000 (17:40 -0500)]
Enable OpenGL ES 3.0 context creation.
Bug
19362672
Change-Id: Ie948dd0c26a6a5f65f6e15b75f2376d598129c28
Reviewed-on: https://swiftshader-review.googlesource.com/2287
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Fri, 13 Feb 2015 16:29:13 +0000 (11:29 -0500)]
LibGL Simple cube test modification.
Added display lists initialization and calls as well as a scaling operation, making the cube shrink then grow.
Change-Id: I861e35443d9b8bda86f3ca6b64ddad40916b221e
Reviewed-on: https://swiftshader-review.googlesource.com/2270
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Alexis Hetu [Wed, 11 Feb 2015 21:11:07 +0000 (16:11 -0500)]
Texture3D copy to level
Bug
19126833
Change-Id: I6da0f1a3d09ab8f510f6f5b2600d911095e02a43
Reviewed-on: https://swiftshader-review.googlesource.com/2200
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Thu, 12 Feb 2015 21:52:54 +0000 (16:52 -0500)]
wglSwapBuffers signature fix
Change-Id: I5db85ef3d850582aa0134074f7e6fc873402f334
Reviewed-on: https://swiftshader-review.googlesource.com/2261
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 12 Feb 2015 20:27:55 +0000 (15:27 -0500)]
Fix supporting samplers in structs passed down as function arguments.
Bug
19354873
Change-Id: Ic21a36eefcdef4d9fcce1952fa15425da8858200
Reviewed-on: https://swiftshader-review.googlesource.com/2260
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 12 Feb 2015 19:05:44 +0000 (14:05 -0500)]
Always wait for the debugger.
Bug
19354873
Change-Id: I2f39ccdd6c5ce10fb583eda500e9da7a6c111d9b
Reviewed-on: https://swiftshader-review.googlesource.com/2250
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 12 Feb 2015 21:53:27 +0000 (16:53 -0500)]
Fix the Code::Blocks builds.
Change-Id: Ic505bc34e41f5c6a5f6d223f6ea6189edc748e7c
Reviewed-on: https://swiftshader-review.googlesource.com/2262
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 21:27:49 +0000 (16:27 -0500)]
Eliminate the ShaderLang interface.
Bug
19331817
Change-Id: I6f5e0c1130974a16cec9575f0fefdd81707b648b
Reviewed-on: https://swiftshader-review.googlesource.com/2153
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 21:02:55 +0000 (16:02 -0500)]
Eliminate the abstract shader compiler interface.
Bug
19331817
Change-Id: I13bc44264ac8727aa246f25960e054ab2875ecec
Reviewed-on: https://swiftshader-review.googlesource.com/2152
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 20:42:31 +0000 (15:42 -0500)]
Eliminate TShHandleBase.
Bug
19331817
Change-Id: I3dc11a3e4eaea734ae86e2722d2565ce136fe335
Reviewed-on: https://swiftshader-review.googlesource.com/2151
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 20:35:11 +0000 (15:35 -0500)]
Rename ShHandle to Compiler.
Bug
19331817
Change-Id: I0e7b1da2663ccc86e9f9c3501a7fa7567880d3bb
Reviewed-on: https://swiftshader-review.googlesource.com/2150
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 18:58:40 +0000 (13:58 -0500)]
Safely promote uninitialized constants.
Bug
19331817
Change-Id: Ia0e032301f360b7d866c3d64ee6cf41c2e481bf3
Reviewed-on: https://swiftshader-review.googlesource.com/2120
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 18:55:57 +0000 (13:55 -0500)]
Ignore constants that have not been initialized.
Bug
19331817
Change-Id: Ib2d41e072306e4fb64a6e074705982982c08cdd4
Reviewed-on: https://swiftshader-review.googlesource.com/2111
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 18:54:19 +0000 (13:54 -0500)]
Provide safer and more convenient constant union accessors.
Bug
19331817
Change-Id: Ia2dccfbc983750fc484a578013c90a1dd501eb6d
Reviewed-on: https://swiftshader-review.googlesource.com/2110
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Maxime Gregoire [Wed, 11 Feb 2015 15:13:20 +0000 (10:13 -0500)]
OpenGL 2.1 Simple test cube application
Change-Id: I6609158f6b675082591ebe0f198e43e3218ffc34
Reviewed-on: https://swiftshader-review.googlesource.com/2170
Tested-by: Maxime Grégoire <mgregoire@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 11 Feb 2015 20:29:25 +0000 (15:29 -0500)]
Add OpenGL ES 3.0 entry function stubs.
Bug
19353461
Change-Id: Ib48ae3263a1a570067dc0bc9a3dd2252f5a282a3
Reviewed-on: https://swiftshader-review.googlesource.com/2191
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Wed, 11 Feb 2015 20:11:41 +0000 (15:11 -0500)]
Add OpenGL ES 3.0 headers.
Bug
19353461
Change-Id: I8fddcb3afec4382029a638077e92c90df2f1b5b5
Reviewed-on: https://swiftshader-review.googlesource.com/2190
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Tue, 10 Feb 2015 16:41:49 +0000 (11:41 -0500)]
Predefine GL_FRAGMENT_PRECISION_HIGH.
Bug
19331817
Change-Id: Ic0182a2413b6eee5343cde63f4655327bdc1d479
Reviewed-on: https://swiftshader-review.googlesource.com/2092
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 30 Jan 2015 05:33:26 +0000 (00:33 -0500)]
Implement an OpenGL 2.1 prototype.
Bug
18962347
Change-Id: I9a7b07647b1b3f561dd9e4597670e63641b155a8
Reviewed-on: https://swiftshader-review.googlesource.com/1810
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Thu, 29 Jan 2015 20:10:09 +0000 (15:10 -0500)]
Share the name space implementation between all GL versions.
Bug
18962347
Change-Id: Ifd7ca4142d90798d0bbe2defa9337bac17e20daf
Reviewed-on: https://swiftshader-review.googlesource.com/1881
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Nicolas Capens [Fri, 30 Jan 2015 04:46:44 +0000 (23:46 -0500)]
Access binding pointer objects through operators.
Bug
18962347
Change-Id: Ia28555a8b3e8923309e3a760d78fa276bd7b8c8d
Reviewed-on: https://swiftshader-review.googlesource.com/1890
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>