AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add vector GrSLTypes for shorts"

Browse Source 
This reverts commit af37a53a84.

Reason for revert: Compiler errors

Original change's description:
> Add vector GrSLTypes for shorts
> 
> Bug: skia:
> Change-Id: Icb9eb1fcb0f879cd0bfdd27d06459843361c9947
> Reviewed-on: https://skia-review.googlesource.com/62943
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=egdaniel@google.com,csmartdalton@google.com,ethannicholas@google.com

Change-Id: Ib23b28be92e199459fe1666fb1ec0e46e141a8f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/63460
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2017-10-24 19:53:13 +00:00 committed by Skia Commit-Bot
parent af37a53a84
commit 6dd0d8a265
4 changed files with 10 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/private/GrTypesPriv.h
View File

@ -110,13 +110,7 @@ enum GrSLType {
kVoid_GrSLType,
kBool_GrSLType,
kShort_GrSLType,
kShort2_GrSLType,
kShort3_GrSLType,
kShort4_GrSLType,
kUShort_GrSLType,
kUShort2_GrSLType,
kUShort3_GrSLType,
kUShort4_GrSLType,
kFloat_GrSLType,
kFloat2_GrSLType,
kFloat3_GrSLType,
@ -214,13 +208,7 @@ static inline bool GrSLTypeIsFloatType(GrSLType type) {
case kBufferSampler_GrSLType:
case kBool_GrSLType:
case kShort_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
case kInt_GrSLType:
case kInt2_GrSLType:
case kInt3_GrSLType:
@ -269,13 +257,7 @@ static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) {
case kBufferSampler_GrSLType:
case kBool_GrSLType:
case kShort_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
case kImageStorage2D_GrSLType:
@ -318,13 +300,7 @@ static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
case kUint2_GrSLType:
case kBool_GrSLType:
case kShort_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
case kImageStorage2D_GrSLType:
@ -364,13 +340,7 @@ static inline bool GrSLTypeIsImageStorage(GrSLType type) {
case kUint2_GrSLType:
case kBool_GrSLType:
case kShort_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
case kTexture2DSampler_GrSLType:
@ -400,13 +370,7 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) {
case kVoid_GrSLType:
case kBool_GrSLType:
case kShort_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
case kFloat_GrSLType:
case kFloat2_GrSLType:
case kFloat3_GrSLType:
@ -472,12 +436,6 @@ static inline bool GrSLTypeTemporarilyAcceptsPrecision(GrSLType type) {
case kVoid_GrSLType:
case kBool_GrSLType:
case kShort2_GrSLType:
case kShort3_GrSLType:
case kShort4_GrSLType:
case kUShort2_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
return false;
}
SK_ABORT("Unexpected type");
@ -568,7 +526,7 @@ static inline GrSLType GrVertexAttribTypeToSLType(GrVertexAttribType type) {
case kUShort2_norm_GrVertexAttribType: // fall through
return kFloat2_GrSLType;
case kUShort2_GrVertexAttribType:
return kUShort2_GrSLType;
return kUint2_GrSLType;
case kUByte_norm_GrVertexAttribType: // fall through
case kFloat_GrVertexAttribType:
return kFloat_GrSLType;

12
src/gpu/glsl/GrGLSL.cpp
View File

@ -89,20 +89,8 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) {
return "uint";
case kShort_GrSLType:
return "short";
case kShort2_GrSLType:
return "short2";
case kShort3_GrSLType:
return "short3";
case kShort4_GrSLType:
return "short4";
case kUShort_GrSLType:
return "ushort";
case kUShort2_GrSLType:
return "ushort2";
case kUShort3_GrSLType:
return "ushort3";
case kUShort4_GrSLType:
return "ushort4";
case kTexture2D_GrSLType:
return "texture2D";
case kSampler_GrSLType:

40
src/gpu/vk/GrVkUniformHandler.cpp
View File

@ -14,22 +14,12 @@
// This alignment mask will give correct alignments for using the std430 block layout. If you want
// the std140 alignment, you can use this, but then make sure if you have an array type it is
// aligned to 16 bytes (i.e. has mask of 0xF).
// These are designated in the Vulkan spec, section 14.5.4 "Offset and Stride Assignment".
// https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html#interfaces-resources-layout
uint32_t grsltype_to_alignment_mask(GrSLType type) {
switch(type) {
case kShort_GrSLType: // fall through
case kUShort_GrSLType:
return 0x1;
case kShort2_GrSLType: // fall through
case kUShort2_GrSLType:
return 0x3;
case kShort3_GrSLType: // fall through
case kShort4_GrSLType:
case kUShort3_GrSLType:
case kUShort4_GrSLType:
return 0x7;
case kInt_GrSLType:
return 0x3;
case kUShort_GrSLType: // fall through
case kUint_GrSLType:
return 0x3;
case kHalf_GrSLType: // fall through
@ -45,7 +35,7 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
case kFloat4_GrSLType:
return 0xF;
case kUint2_GrSLType:
return 0x7;
return 0x3;
case kInt2_GrSLType:
return 0x7;
case kInt3_GrSLType:
@ -80,27 +70,15 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
return 0;
}
/** Returns the size in bytes taken up in vulkanbuffers for GrSLTypes. */
/** Returns the size in bytes taken up in vulkanbuffers for floating point GrSLTypes.
For non floating point type returns 0. Currently this reflects the std140 alignment
so a float2x2 takes up 8 floats. */
static inline uint32_t grsltype_to_vk_size(GrSLType type) {
switch(type) {
case kShort_GrSLType:
return sizeof(int16_t);
case kShort2_GrSLType:
return 2 * sizeof(int16_t);
case kShort3_GrSLType:
return 3 * sizeof(int16_t);
case kShort4_GrSLType:
return 4 * sizeof(int16_t);
case kUShort_GrSLType:
return sizeof(uint16_t);
case kUShort2_GrSLType:
return 2 * sizeof(uint16_t);
case kUShort3_GrSLType:
return 3 * sizeof(uint16_t);
case kUShort4_GrSLType:
return 4 * sizeof(uint16_t);
case kShort_GrSLType: // fall through
case kInt_GrSLType:
return sizeof(int32_t);
case kUShort_GrSLType: // fall through
case kUint_GrSLType:
return sizeof(int32_t);
case kHalf_GrSLType: // fall through
@ -116,7 +94,7 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
case kFloat4_GrSLType:
return 4 * sizeof(float);
case kUint2_GrSLType:
return 2 * sizeof(uint32_t);
return 2 * sizeof(uint16_t);
case kInt2_GrSLType:
return 2 * sizeof(int32_t);
case kInt3_GrSLType:

6
src/gpu/vk/GrVkVaryingHandler.cpp
View File

@ -28,16 +28,10 @@ static inline int grsltype_to_location_size(GrSLType type) {
case kUint2_GrSLType:
return 1;
case kInt2_GrSLType:
case kShort2_GrSLType:
case kUShort2_GrSLType:
return 1;
case kInt3_GrSLType:
case kShort3_GrSLType:
case kUShort3_GrSLType:
return 1;
case kInt4_GrSLType:
case kShort4_GrSLType:
case kUShort4_GrSLType:
return 1;
case kFloat2x2_GrSLType:
case kHalf2x2_GrSLType: