|
1210 | 1210 | const plSpecializationConstant* ptConstant = &ptShader->tDesc.atConstants[i]; |
1211 | 1211 | if(ptConstant->tType == PL_DATA_TYPE_UNSPECIFIED) |
1212 | 1212 | break; |
1213 | | - uTotalConstantSize += pl__get_data_type_size(ptConstant->tType); |
| 1213 | + uTotalConstantSize += pl_get_data_type_size(ptConstant->tType); |
1214 | 1214 | ptShader->tDesc._uConstantCount++; |
1215 | 1215 | } |
1216 | 1216 |
|
|
1235 | 1235 | const uint32_t uConstantIndex = ptConstant->uID == 0 ? i : ptConstant->uID; |
1236 | 1236 | const uint32_t uAutoConstantOffset = ptConstant->uOffset == 0 ? uConstantOffset : ptConstant->uOffset; |
1237 | 1237 | [ptConstantValues setConstantValue:&pcConstantData[uAutoConstantOffset] type:pl__metal_data_type(ptConstant->tType) atIndex:uConstantIndex]; |
1238 | | - uConstantOffset += (uint32_t)pl__get_data_type_size(ptConstant->tType); |
| 1238 | + uConstantOffset += (uint32_t)pl_get_data_type_size(ptConstant->tType); |
1239 | 1239 | } |
1240 | 1240 |
|
1241 | 1241 | id<MTLFunction> computeFunction = [ptMetalShader->library newFunctionWithName:entryFunc constantValues:ptConstantValues error:&error]; |
|
1369 | 1369 | const plSpecializationConstant* ptConstant = &ptShader->tDesc.atConstants[i]; |
1370 | 1370 | if(ptConstant->tType == PL_DATA_TYPE_UNSPECIFIED) |
1371 | 1371 | break; |
1372 | | - uTotalConstantSize += pl__get_data_type_size(ptConstant->tType); |
| 1372 | + uTotalConstantSize += pl_get_data_type_size(ptConstant->tType); |
1373 | 1373 | ptShader->tDesc._uConstantCount++; |
1374 | 1374 | } |
1375 | 1375 |
|
|
1394 | 1394 | const uint32_t uConstantIndex = ptConstant->uID == 0 ? i : ptConstant->uID; |
1395 | 1395 | const uint32_t uAutoConstantOffset = ptConstant->uOffset == 0 ? uConstantOffset : ptConstant->uOffset; |
1396 | 1396 | [ptConstantValues setConstantValue:&pcConstantData[uAutoConstantOffset] type:pl__metal_data_type(ptConstant->tType) atIndex:uConstantIndex]; |
1397 | | - uConstantOffset += (uint32_t)pl__get_data_type_size(ptConstant->tType); |
| 1397 | + uConstantOffset += (uint32_t)pl_get_data_type_size(ptConstant->tType); |
1398 | 1398 | } |
1399 | 1399 |
|
1400 | 1400 | id<MTLFunction> vertexFunction = [ptMetalShader->tVertexLibrary newFunctionWithName:vertexEntry constantValues:ptConstantValues error:&error]; |
|
2933 | 2933 |
|
2934 | 2934 | case PL_DATA_TYPE_BOOL: return MTLDataTypeBool; |
2935 | 2935 | case PL_DATA_TYPE_FLOAT: return MTLDataTypeFloat; |
2936 | | - case PL_DATA_TYPE_UNSIGNED_BYTE: return MTLDataTypeUChar; |
2937 | | - case PL_DATA_TYPE_BYTE: return MTLDataTypeChar; |
2938 | | - case PL_DATA_TYPE_UNSIGNED_SHORT: return MTLDataTypeUShort; |
| 2936 | + case PL_DATA_TYPE_UCHAR: return MTLDataTypeUChar; |
| 2937 | + case PL_DATA_TYPE_CHAR: return MTLDataTypeChar; |
| 2938 | + case PL_DATA_TYPE_USHORT: return MTLDataTypeUShort; |
2939 | 2939 | case PL_DATA_TYPE_SHORT: return MTLDataTypeShort; |
2940 | | - case PL_DATA_TYPE_UNSIGNED_INT: return MTLDataTypeUInt; |
| 2940 | + case PL_DATA_TYPE_UINT: return MTLDataTypeUInt; |
2941 | 2941 | case PL_DATA_TYPE_INT: return MTLDataTypeInt; |
2942 | | - case PL_DATA_TYPE_UNSIGNED_LONG: return MTLDataTypeULong; |
2943 | | - case PL_DATA_TYPE_LONG: return MTLDataTypeLong; |
2944 | 2942 |
|
2945 | 2943 | case PL_DATA_TYPE_BOOL2: return MTLDataTypeBool2; |
2946 | 2944 | case PL_DATA_TYPE_FLOAT2: return MTLDataTypeFloat2; |
2947 | | - case PL_DATA_TYPE_UNSIGNED_BYTE2: return MTLDataTypeUChar2; |
2948 | | - case PL_DATA_TYPE_BYTE2: return MTLDataTypeChar2; |
2949 | | - case PL_DATA_TYPE_UNSIGNED_SHORT2: return MTLDataTypeUShort2; |
| 2945 | + case PL_DATA_TYPE_UCHAR2: return MTLDataTypeUChar2; |
| 2946 | + case PL_DATA_TYPE_CHAR2: return MTLDataTypeChar2; |
| 2947 | + case PL_DATA_TYPE_USHORT2: return MTLDataTypeUShort2; |
2950 | 2948 | case PL_DATA_TYPE_SHORT2: return MTLDataTypeShort2; |
2951 | | - case PL_DATA_TYPE_UNSIGNED_INT2: return MTLDataTypeUInt2; |
| 2949 | + case PL_DATA_TYPE_UINT2: return MTLDataTypeUInt2; |
2952 | 2950 | case PL_DATA_TYPE_INT2: return MTLDataTypeInt2; |
2953 | | - case PL_DATA_TYPE_UNSIGNED_LONG2: return MTLDataTypeULong2; |
2954 | | - case PL_DATA_TYPE_LONG2: return MTLDataTypeLong2; |
2955 | 2951 |
|
2956 | 2952 | case PL_DATA_TYPE_BOOL3: return MTLDataTypeBool3; |
2957 | 2953 | case PL_DATA_TYPE_FLOAT3: return MTLDataTypeFloat3; |
2958 | | - case PL_DATA_TYPE_UNSIGNED_BYTE3: return MTLDataTypeUChar3; |
2959 | | - case PL_DATA_TYPE_BYTE3: return MTLDataTypeChar3; |
2960 | | - case PL_DATA_TYPE_UNSIGNED_SHORT3: return MTLDataTypeUShort3; |
| 2954 | + case PL_DATA_TYPE_UCHAR3: return MTLDataTypeUChar3; |
| 2955 | + case PL_DATA_TYPE_CHAR3: return MTLDataTypeChar3; |
| 2956 | + case PL_DATA_TYPE_USHORT3: return MTLDataTypeUShort3; |
2961 | 2957 | case PL_DATA_TYPE_SHORT3: return MTLDataTypeShort3; |
2962 | | - case PL_DATA_TYPE_UNSIGNED_INT3: return MTLDataTypeUInt3; |
| 2958 | + case PL_DATA_TYPE_UINT3: return MTLDataTypeUInt3; |
2963 | 2959 | case PL_DATA_TYPE_INT3: return MTLDataTypeInt3; |
2964 | | - case PL_DATA_TYPE_UNSIGNED_LONG3: return MTLDataTypeULong3; |
2965 | | - case PL_DATA_TYPE_LONG3: return MTLDataTypeLong3; |
2966 | 2960 |
|
2967 | 2961 | case PL_DATA_TYPE_BOOL4: return MTLDataTypeBool4; |
2968 | 2962 | case PL_DATA_TYPE_FLOAT4: return MTLDataTypeFloat4; |
2969 | | - case PL_DATA_TYPE_UNSIGNED_BYTE4: return MTLDataTypeUChar4; |
2970 | | - case PL_DATA_TYPE_BYTE4: return MTLDataTypeChar4; |
2971 | | - case PL_DATA_TYPE_UNSIGNED_SHORT4: return MTLDataTypeUShort4; |
| 2963 | + case PL_DATA_TYPE_UCHAR4: return MTLDataTypeUChar4; |
| 2964 | + case PL_DATA_TYPE_CHAR4: return MTLDataTypeChar4; |
| 2965 | + case PL_DATA_TYPE_USHORT4: return MTLDataTypeUShort4; |
2972 | 2966 | case PL_DATA_TYPE_SHORT4: return MTLDataTypeShort4; |
2973 | | - case PL_DATA_TYPE_UNSIGNED_INT4: return MTLDataTypeUInt4; |
| 2967 | + case PL_DATA_TYPE_UINT4: return MTLDataTypeUInt4; |
2974 | 2968 | case PL_DATA_TYPE_INT4: return MTLDataTypeInt4; |
2975 | | - case PL_DATA_TYPE_UNSIGNED_LONG4: return MTLDataTypeULong4; |
2976 | | - case PL_DATA_TYPE_LONG4: return MTLDataTypeLong4; |
2977 | 2969 | } |
2978 | 2970 |
|
2979 | 2971 | PL_ASSERT(false && "Unsupported data type"); |
|
0 commit comments