skia2

AuroraMiddleware/skia2

Fork 0

Commit Graph

Author	SHA1	Message	Date
John Stiles	2630ea3312	Disallow identifier names that overlap existing types. It's not legal to use identifiers like "int" or "sampler" to name your variables (or enums, or structs, etc.). SkSL will now report this as an error instead of relying on the driver to catch this. (Note that in some contexts, it might be legal by the spec to reuse a name that you introduced yourself, depending on the scope. In practice, this confuses Apple GLSL, so we shouldn't support it anyway.) This caught several existing places in our code where we used the name "sampler." These were never exposed to the driver (they were intrinsics that we would replace during compilation) so they were harmless before. Change-Id: Ia6dcfca8c500d02e1eb5f9427bed8727e114dfc2 Bug: skia:11036 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340758 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>	2020-12-04 16:52:01 +00:00
John Stiles	aeae3a58e3	Add golden outputs for the Metal backend. This CL also updates the blend tests to use sk_FragColor instead of returning a half4, as the Metal backend assumes that a fragment processor's `main` will return void and always synthesizes a `return *_out;` at the end. (context link: https://osscs.corp.google.com/android/platform/superproject/+/master:external/skqp/src/sksl/SkSLMetalCodeGenerator.cpp;l=803;drc=842d31b14159626054e01dd32826563a8f4214bf ) BYPASS_INCLUSIVE_LANGUAGE_REASON=see http://b/168134166 Change-Id: I330a456bf25ee72d3a29c59cd624625378ae80a0 Bug: skia:10649, skia:10757, skia:10758, skia:10759, skia:10760, skia:10761, skia:10762 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319409 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>	2020-09-25 17:46:43 +00:00
John Stiles	ab4ab20fcf	Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>	2020-09-25 17:13:53 +00:00

Author

SHA1

Message

Date

John Stiles

2630ea3312

Disallow identifier names that overlap existing types.

It's not legal to use identifiers like "int" or "sampler" to name your
variables (or enums, or structs, etc.). SkSL will now report this as an
error instead of relying on the driver to catch this.

(Note that in some contexts, it might be legal by the spec to reuse a
name that you introduced yourself, depending on the scope. In practice,
this confuses Apple GLSL, so we shouldn't support it anyway.)

This caught several existing places in our code where we used the name
"sampler." These were never exposed to the driver (they were intrinsics
that we would replace during compilation) so they were harmless before.

Change-Id: Ia6dcfca8c500d02e1eb5f9427bed8727e114dfc2
Bug: skia:11036
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340758
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

2020-12-04 16:52:01 +00:00

John Stiles

aeae3a58e3

Add golden outputs for the Metal backend.

This CL also updates the blend tests to use sk_FragColor instead of
returning a half4, as the Metal backend assumes that a fragment
processor's `main` will return void and always synthesizes a
`return *_out;` at the end.

(context link:
https://osscs.corp.google.com/android/platform/superproject/+/master:external/skqp/src/sksl/SkSLMetalCodeGenerator.cpp;l=803;drc=842d31b14159626054e01dd32826563a8f4214bf )

BYPASS_INCLUSIVE_LANGUAGE_REASON=see http://b/168134166

Change-Id: I330a456bf25ee72d3a29c59cd624625378ae80a0
Bug: skia:10649, skia:10757, skia:10758, skia:10759, skia:10760, skia:10761, skia:10762
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319409
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

2020-09-25 17:46:43 +00:00

John Stiles

ab4ab20fcf

Migrate most SkSL tests currently in /glsl/ to /shared/.

These tests will also be used for Metal and SPIR-V testing. A small
handful of GLSL-specific stragglers (#version-specific or type-precision
related) will remain in /glsl/.

Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff
Bug: skia:10649
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

2020-09-25 17:13:53 +00:00

3 Commits