Commits · 2c2a7b29cd53cb7b06ef1b1e2177a8c90e6e0128 · Chen Yisong / swiftshader

01 Feb, 2016 2 commits

Passing uniform buffers to the vertex/pixel programs · 2c2a7b29

authored Oct 27, 2015

This cl contains the necessary changes to make uniform buffers
usable in shaders. A few things to note:
- Uniform buffers can be set, but nothing will attempt to access
  them in this cl.
- While the 'index' of uniforms is expressed in terms of registers,
  uniform buffer 'index' is expressed in bytes in both PixelProgram
  and VertexProgram. This is necessary because of packing which can
  potentially put some variables in the middle of registers.
  Technically, std140 always packs variables in multiples of byte4,
  but other future layouts may not, so using bytes as the unit is
  more future proof.
- The above mentioned 'index' will have to be computed in OutputASM
  and extra operations will need to be added (to fetch a row from a
  row major matrix, for example).

Change-Id: I636cc4bdc6fe90d6f5697e735f4288f48d18a75b
Reviewed-on: https://swiftshader-review.googlesource.com/4151Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

2c2a7b29

Uniform buffer array register fix · 2cb618d6

authored Feb 01, 2016

Register indices were only set for the first instance of the array
when the uniform block array was present in both the fragment and
vertex shaders, so this code takes care of the array case.

Change-Id: I8a98470fedcc67bdc5edfd3b852470f5f911d610
Reviewed-on: https://swiftshader-review.googlesource.com/4630Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

2cb618d6

28 Jan, 2016 2 commits

Implement glGetPointerv(). · ccd97810

authored Jan 28, 2016

Bug 26794307

Change-Id: I0aa175f091550d544a33503b602c191353e7a1c5
Reviewed-on: https://swiftshader-review.googlesource.com/4606Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

ccd97810

Fix attribute size queries. · b8cec702

authored Jan 28, 2016

Bug 26794307

Change-Id: I66a440221435e63574c5da4204a9d2b00ece73f4
Reviewed-on: https://swiftshader-review.googlesource.com/4604Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

b8cec702

26 Jan, 2016 1 commit

Detect all texture sampling shader instructions. · 6abe1cbc

authored Jan 15, 2016

Change-Id: If557db7db89659e6c2b043b21e5712fb34eafd8d
Reviewed-on: https://swiftshader-review.googlesource.com/4561Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

6abe1cbc

25 Jan, 2016 6 commits

Remove unnecessary friend class declarations. · a893e903

authored Jan 18, 2016

Change-Id: Ida83136a083642bd6cd651c4cb506723e8ac9a41
Reviewed-on: https://swiftshader-review.googlesource.com/4570Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

a893e903

Make vertex registers members of routine classes. · 7551ac68

authored Jan 20, 2016

Bug 22652760

Change-Id: I698ce910ee4302178d7235fa316aaa2b268e71a8
Reviewed-on: https://swiftshader-review.googlesource.com/4560Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

7551ac68

Move loop register usage to relative addressing. · 907700d1

authored Jan 20, 2016

Bug 22652760

Change-Id: I50c6935bac91f586953b0dd2abd0d2a859468ee1
Reviewed-on: https://swiftshader-review.googlesource.com/4579Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

907700d1

Move parameter reading to a prototype constructor. · d2fad90b

authored Jan 15, 2016

Bug 22652760

Change-Id: I317275cd2c15012da3a859735409af07ea9b2923
Reviewed-on: https://swiftshader-review.googlesource.com/4559Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

d2fad90b

Eliminate redundant register set argument passing. · b4fb3678

authored Jan 15, 2016

Bug 22652760

Change-Id: If6bf124c3218847ecc4af0ae16102452a6b344d9
Reviewed-on: https://swiftshader-review.googlesource.com/4558Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

b4fb3678

Derive VertexRoutine from Function<>. · 2ca19030

authored Jan 15, 2016

Bug 22652760

Change-Id: I48e9e1f3ff677429eff1aea2f80b1e384a537a14
Reviewed-on: https://swiftshader-review.googlesource.com/4557Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

2ca19030

15 Jan, 2016 9 commits

Fix glBindVertexArray() compilation regression. · 060a2d3f

authored Jan 15, 2016

Change-Id: I7da54053b3be31b4388dd9c0f4d89298e656bee2
Reviewed-on: https://swiftshader-review.googlesource.com/4556Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

060a2d3f

Remove unused return value. · 29faf67e

authored Jan 13, 2016

Change-Id: I99731b6697a4ae92b1d04c8a8d895a0cf19d580c
Reviewed-on: https://swiftshader-review.googlesource.com/4545Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

29faf67e

Remove redundant shader instructions. · 70589080

authored Oct 15, 2015

Bool to int and int to bool also work for unsigned int.

Change-Id: I31669d8754a718096381609d13c2e9668599efe5
Reviewed-on: https://swiftshader-review.googlesource.com/4070Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

70589080

Fix Clang warnings. · 69c5c387

authored Jan 14, 2016

Change-Id: I9630093a14d0c1b2b6dc60ffb5866c7d2eaf4f02
Reviewed-on: https://swiftshader-review.googlesource.com/4552Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

69c5c387

Fix returning an opaque handle for eglGetCurrentDisplay(). · a810d0c8

authored Jan 15, 2016

Change-Id: If7524c5245951ed87bcb8caacda2264db0875dad
Reviewed-on: https://swiftshader-review.googlesource.com/4554Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

a810d0c8

Added some uses of FRAGMENT_UNIFORM_VECTORS and VERTEX_UNIFORM_VECTORS · 028f41ba

authored Jan 13, 2016

Replaced a few instances of 224 and 256 that were actually used to
represent FRAGMENT_UNIFORM_VECTORS and VERTEX_UNIFORM_VECTORS.

This cl should not change any behavior.

Change-Id: I4b82341f32223fcee559aaf70df2ee83c9936d11
Reviewed-on: https://swiftshader-review.googlesource.com/4547Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

028f41ba

Move parameter reading to routine constructor. · ba53fbf9

authored Jan 14, 2016

Bug 22652760

Change-Id: If2b41c4d3b24f4b8a9d9dd805a9ab3ce724b7726
Reviewed-on: https://swiftshader-review.googlesource.com/4553Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

ba53fbf9

Derive Rasterizer from Function<>. · 4f172c78

authored Jan 13, 2016

Bug 22652760

Change-Id: I1a8ff978fdc7ad795e469218a931523d624e7cde
Reviewed-on: https://swiftshader-review.googlesource.com/4546Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

4f172c78

Fix Clang errors on Linux. · 520acc67

authored Jan 14, 2016

Change-Id: I8bc812cd6c25a60dc73abc2177e8eb4a3841af21
Reviewed-on: https://swiftshader-review.googlesource.com/4551Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

520acc67

14 Jan, 2016 3 commits

Make Function arguments type-safe. · 81f1830d

authored Jan 14, 2016

Change-Id: I3d4262ea4be0c7b1128b2ca410e985cc6f58c9c9
Reviewed-on: https://swiftshader-review.googlesource.com/1970Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

81f1830d

Make Function variadic and take a function signature. · 2ab859f2

authored Feb 05, 2015

Change-Id: If36ea6e74311f54bb4c2b0bc1b5b7ccd0e97d74b
Reviewed-on: https://swiftshader-review.googlesource.com/4548Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

2ab859f2

Disallow assigning to an RValue. · 698633a8

authored Feb 04, 2015

Change-Id: I539fcaa5b7853ac618f3d27027d3357bc6e620ba
Reviewed-on: https://swiftshader-review.googlesource.com/1960Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

698633a8

13 Jan, 2016 5 commits

Ported Angle's std140 encoder to SwiftShader · 8757dead

authored Jan 07, 2016

Added Angle's std140 encoder to properly compute sizes and
offsets of uniform blocks for the std140 standard. All
layouts currently use std140 ('packed' and 'shared' are
implementation dependent, so we can choose to have them be
the same as std140).

All uniform blocks made of simple types or arrays of simple
types are properly interpreted by this code.

Structs are still TBD.

Change-Id: I191d7f313db5d409715b1101ea70903a7b958726
Reviewed-on: https://swiftshader-review.googlesource.com/4525Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

8757dead

Program cleanup · 773b67af

authored Jan 08, 2016

Working on uniforms, I realized that there was a large
amount of code duplication in the applyUniform* functions,
so I create a basic applyUniform() to contain common code
between all these functions, which reduces the size of
Program.cpp by about 275 lines, or about 10% of that file.

Change-Id: I0f013821e1cc8f507bb4d6829b0097fc41420e6d
Reviewed-on: https://swiftshader-review.googlesource.com/4527Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

773b67af

Fixed uniform block lookup · bdda9dac

authored Jan 12, 2016

Blocks are also symbols, so when we have a block,
we have to look for blocks instead of symbols.

Change-Id: I683e646c2c63754a0b27b299dfdbc1d87017fb99
Reviewed-on: https://swiftshader-review.googlesource.com/4542Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

bdda9dac

Fixed uniform block indexing · 6c7ac3c8

authored Jan 12, 2016

A uniform block's qualifier is generally a uniform, so
we have to change that to a temporary in order to be
able to us it as the result of the indexing operation.

Change-Id: I2f5ba7f966e8eaab314322edfa0483a9f24bfbdb
Reviewed-on: https://swiftshader-review.googlesource.com/4543Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

6c7ac3c8

Fixed some types utility functions for uniform blocks · c8b0f54c

authored Jan 12, 2016

Uniform blocks can be neither scalars not registers,
so make sure these never return true for uniform blocks.

Change-Id: Ib00afd175e4df92d45fe1aeaca865ea45fc13b0b
Reviewed-on: https://swiftshader-review.googlesource.com/4544Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

c8b0f54c

12 Jan, 2016 2 commits

Fix signed/unsigned comparison warnings. · 5d96188b

authored Jan 01, 2016

Bug 15387371

Change-Id: Id4c9b54c5c0b4115479b6710c4d8c91d34e5c002
Reviewed-on: https://swiftshader-review.googlesource.com/4494Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

5d96188b

Eliminate intermediate primitive type translation. · 895aa621

authored Jan 02, 2016

Bug 21305111

Change-Id: I3803f274f25a25ec60f0f5cbfc4af0151f39ad04
Reviewed-on: https://swiftshader-review.googlesource.com/4505Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

895aa621

11 Jan, 2016 1 commit

Fix glReadPixels and glClear memory leaks. · ae05d655

authored Jan 11, 2016

Bug 26486408

Change-Id: Iec34ee0034695950163e8e40082d1ad7128490f8
Reviewed-on: https://swiftshader-review.googlesource.com/4533Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

ae05d655

09 Jan, 2016 9 commits

Add ./ to the test app's rpath. · 7ce62b76

authored Jan 09, 2016

Change-Id: If93cfd390846e26348a6f30a85d340d4df57e891
Reviewed-on: https://swiftshader-review.googlesource.com/4532Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

7ce62b76

Fix memory leaks. · b4af9f7b

authored Jan 08, 2016

Change-Id: I668c4295fd13d028fa53f6aa75ac6c6d4c6de44f
Reviewed-on: https://swiftshader-review.googlesource.com/4531Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

b4af9f7b

authored Jan 02, 2016

Bug 15387371

Change-Id: I771b6e9f30669aade18eba8b3749fcb71ae8ef97
Reviewed-on: https://swiftshader-review.googlesource.com/4501Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

9185981d

Fix tautological expressions. · e5284ac9

authored Jan 08, 2016

Bug 15387371

Change-Id: I01bf5327f205bf646c51c1bb06560448a09f6c4a
Reviewed-on: https://swiftshader-review.googlesource.com/4526Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

e5284ac9

Fix LLVM code warnings. · f6e849c9

authored Jan 01, 2016

Bug 15387371

Change-Id: Ic5374735e6ca386e871848c34890272c1259c273
Reviewed-on: https://swiftshader-review.googlesource.com/4496Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

f6e849c9

Fix operator precedence warnings. · 3b396464

authored Jan 02, 2016

Bug 15387371

Change-Id: I665ee641932d34abb28f150ba036bbbed9fa1431
Reviewed-on: https://swiftshader-review.googlesource.com/4503Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

3b396464

Add default switch cases. · b69aa273

authored Jan 02, 2016

Bug 15387371

Change-Id: I97644bfd9dbdc1109630199bc897f8b2572d5e83
Reviewed-on: https://swiftshader-review.googlesource.com/4502Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

b69aa273

Fix potentially uninitialized variables. · 8833e016

authored Jan 01, 2016

Bug 15387371

Change-Id: Ie0486feeebc6e4bceba148bea69f2d1ee1d1ffd8
Reviewed-on: https://swiftshader-review.googlesource.com/4499Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

8833e016

Fix macro redefinition warning. · 50f1a73b

authored Jan 01, 2016

Bug 15387371

Change-Id: I1d9524b15a62a561508a5cc2b76ba0b1e8d37fdc
Reviewed-on: https://swiftshader-review.googlesource.com/4495Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

50f1a73b