summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2018-12-24 03:10:13 -0300
committerGravatar ReinUsesLisp2019-01-15 17:54:53 -0300
commitab7f52b279076de459268c61641305544df3637f (patch)
tree08a21d3a7914ba3d76a6e5f3bd269f63954bc655 /src/video_core
parentshader_decode: Fixup PSET (diff)
downloadyuzu-ab7f52b279076de459268c61641305544df3637f.tar.gz
yuzu-ab7f52b279076de459268c61641305544df3637f.tar.xz
yuzu-ab7f52b279076de459268c61641305544df3637f.zip
glsl_decompiler: Fixup permissive member function declarations
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/shader/glsl_decompiler.cpp266
1 files changed, 133 insertions, 133 deletions
diff --git a/src/video_core/shader/glsl_decompiler.cpp b/src/video_core/shader/glsl_decompiler.cpp
index 9b443e61a..2ee8cefab 100644
--- a/src/video_core/shader/glsl_decompiler.cpp
+++ b/src/video_core/shader/glsl_decompiler.cpp
@@ -1295,139 +1295,139 @@ private:
1295 } 1295 }
1296 1296
1297 static constexpr OperationDecompilersArray operation_decompilers = { 1297 static constexpr OperationDecompilersArray operation_decompilers = {
1298 &Assign, 1298 &GLSLDecompiler::Assign,
1299 &AssignComposite, 1299 &GLSLDecompiler::AssignComposite,
1300 1300
1301 &Composite, 1301 &GLSLDecompiler::Composite,
1302 &Select, 1302 &GLSLDecompiler::Select,
1303 1303
1304 &Add<Type::Float>, 1304 &GLSLDecompiler::Add<Type::Float>,
1305 &Mul<Type::Float>, 1305 &GLSLDecompiler::Mul<Type::Float>,
1306 &Div<Type::Float>, 1306 &GLSLDecompiler::Div<Type::Float>,
1307 &Fma<Type::Float>, 1307 &GLSLDecompiler::Fma<Type::Float>,
1308 &Negate<Type::Float>, 1308 &GLSLDecompiler::Negate<Type::Float>,
1309 &Absolute<Type::Float>, 1309 &GLSLDecompiler::Absolute<Type::Float>,
1310 &FClamp, 1310 &GLSLDecompiler::FClamp,
1311 &Min<Type::Float>, 1311 &GLSLDecompiler::Min<Type::Float>,
1312 &Max<Type::Float>, 1312 &GLSLDecompiler::Max<Type::Float>,
1313 &FCos, 1313 &GLSLDecompiler::FCos,
1314 &FSin, 1314 &GLSLDecompiler::FSin,
1315 &FExp2, 1315 &GLSLDecompiler::FExp2,
1316 &FLog2, 1316 &GLSLDecompiler::FLog2,
1317 &FInverseSqrt, 1317 &GLSLDecompiler::FInverseSqrt,
1318 &FSqrt, 1318 &GLSLDecompiler::FSqrt,
1319 &FRoundEven, 1319 &GLSLDecompiler::FRoundEven,
1320 &FFloor, 1320 &GLSLDecompiler::FFloor,
1321 &FCeil, 1321 &GLSLDecompiler::FCeil,
1322 &FTrunc, 1322 &GLSLDecompiler::FTrunc,
1323 &FCastInteger<Type::Int>, 1323 &GLSLDecompiler::FCastInteger<Type::Int>,
1324 &FCastInteger<Type::Uint>, 1324 &GLSLDecompiler::FCastInteger<Type::Uint>,
1325 1325
1326 &Add<Type::Int>, 1326 &GLSLDecompiler::Add<Type::Int>,
1327 &Mul<Type::Int>, 1327 &GLSLDecompiler::Mul<Type::Int>,
1328 &Div<Type::Int>, 1328 &GLSLDecompiler::Div<Type::Int>,
1329 &Negate<Type::Int>, 1329 &GLSLDecompiler::Negate<Type::Int>,
1330 &Absolute<Type::Int>, 1330 &GLSLDecompiler::Absolute<Type::Int>,
1331 &Min<Type::Int>, 1331 &GLSLDecompiler::Min<Type::Int>,
1332 &Max<Type::Int>, 1332 &GLSLDecompiler::Max<Type::Int>,
1333 1333
1334 &ICastFloat, 1334 &GLSLDecompiler::ICastFloat,
1335 &ICastUnsigned, 1335 &GLSLDecompiler::ICastUnsigned,
1336 &LogicalShiftLeft<Type::Int>, 1336 &GLSLDecompiler::LogicalShiftLeft<Type::Int>,
1337 &ILogicalShiftRight, 1337 &GLSLDecompiler::ILogicalShiftRight,
1338 &IArithmeticShiftRight, 1338 &GLSLDecompiler::IArithmeticShiftRight,
1339 &BitwiseAnd<Type::Int>, 1339 &GLSLDecompiler::BitwiseAnd<Type::Int>,
1340 &BitwiseOr<Type::Int>, 1340 &GLSLDecompiler::BitwiseOr<Type::Int>,
1341 &BitwiseXor<Type::Int>, 1341 &GLSLDecompiler::BitwiseXor<Type::Int>,
1342 &BitwiseNot<Type::Int>, 1342 &GLSLDecompiler::BitwiseNot<Type::Int>,
1343 &BitfieldInsert<Type::Int>, 1343 &GLSLDecompiler::BitfieldInsert<Type::Int>,
1344 &BitCount<Type::Int>, 1344 &GLSLDecompiler::BitCount<Type::Int>,
1345 1345
1346 &Add<Type::Uint>, 1346 &GLSLDecompiler::Add<Type::Uint>,
1347 &Mul<Type::Uint>, 1347 &GLSLDecompiler::Mul<Type::Uint>,
1348 &Div<Type::Uint>, 1348 &GLSLDecompiler::Div<Type::Uint>,
1349 &Min<Type::Uint>, 1349 &GLSLDecompiler::Min<Type::Uint>,
1350 &Max<Type::Uint>, 1350 &GLSLDecompiler::Max<Type::Uint>,
1351 &UCastFloat, 1351 &GLSLDecompiler::UCastFloat,
1352 &UCastSigned, 1352 &GLSLDecompiler::UCastSigned,
1353 &LogicalShiftLeft<Type::Uint>, 1353 &GLSLDecompiler::LogicalShiftLeft<Type::Uint>,
1354 &UShiftRight, 1354 &GLSLDecompiler::UShiftRight,
1355 &UShiftRight, 1355 &GLSLDecompiler::UShiftRight,
1356 &BitwiseAnd<Type::Uint>, 1356 &GLSLDecompiler::BitwiseAnd<Type::Uint>,
1357 &BitwiseOr<Type::Uint>, 1357 &GLSLDecompiler::BitwiseOr<Type::Uint>,
1358 &BitwiseXor<Type::Uint>, 1358 &GLSLDecompiler::BitwiseXor<Type::Uint>,
1359 &BitwiseNot<Type::Uint>, 1359 &GLSLDecompiler::BitwiseNot<Type::Uint>,
1360 &BitfieldInsert<Type::Uint>, 1360 &GLSLDecompiler::BitfieldInsert<Type::Uint>,
1361 &BitCount<Type::Uint>, 1361 &GLSLDecompiler::BitCount<Type::Uint>,
1362 1362
1363 &Add<Type::HalfFloat>, 1363 &GLSLDecompiler::Add<Type::HalfFloat>,
1364 &Mul<Type::HalfFloat>, 1364 &GLSLDecompiler::Mul<Type::HalfFloat>,
1365 &Fma<Type::HalfFloat>, 1365 &GLSLDecompiler::Fma<Type::HalfFloat>,
1366 &Absolute<Type::HalfFloat>, 1366 &GLSLDecompiler::Absolute<Type::HalfFloat>,
1367 &HNegate, 1367 &GLSLDecompiler::HNegate,
1368 &HMergeF32, 1368 &GLSLDecompiler::HMergeF32,
1369 &HMergeH0, 1369 &GLSLDecompiler::HMergeH0,
1370 &HMergeH1, 1370 &GLSLDecompiler::HMergeH1,
1371 1371
1372 &LogicalAssign, 1372 &GLSLDecompiler::LogicalAssign,
1373 &LogicalAnd, 1373 &GLSLDecompiler::LogicalAnd,
1374 &LogicalOr, 1374 &GLSLDecompiler::LogicalOr,
1375 &LogicalXor, 1375 &GLSLDecompiler::LogicalXor,
1376 &LogicalNegate, 1376 &GLSLDecompiler::LogicalNegate,
1377 &LogicalPick2, 1377 &GLSLDecompiler::LogicalPick2,
1378 &LogicalAll2, 1378 &GLSLDecompiler::LogicalAll2,
1379 &LogicalAny2, 1379 &GLSLDecompiler::LogicalAny2,
1380 1380
1381 &LogicalLessThan<Type::Float>, 1381 &GLSLDecompiler::LogicalLessThan<Type::Float>,
1382 &LogicalEqual<Type::Float>, 1382 &GLSLDecompiler::LogicalEqual<Type::Float>,
1383 &LogicalLessEqual<Type::Float>, 1383 &GLSLDecompiler::LogicalLessEqual<Type::Float>,
1384 &LogicalGreaterThan<Type::Float>, 1384 &GLSLDecompiler::LogicalGreaterThan<Type::Float>,
1385 &LogicalNotEqual<Type::Float>, 1385 &GLSLDecompiler::LogicalNotEqual<Type::Float>,
1386 &LogicalGreaterEqual<Type::Float>, 1386 &GLSLDecompiler::LogicalGreaterEqual<Type::Float>,
1387 &LogicalFIsNan, 1387 &GLSLDecompiler::LogicalFIsNan,
1388 1388
1389 &LogicalLessThan<Type::Int>, 1389 &GLSLDecompiler::LogicalLessThan<Type::Int>,
1390 &LogicalEqual<Type::Int>, 1390 &GLSLDecompiler::LogicalEqual<Type::Int>,
1391 &LogicalLessEqual<Type::Int>, 1391 &GLSLDecompiler::LogicalLessEqual<Type::Int>,
1392 &LogicalGreaterThan<Type::Int>, 1392 &GLSLDecompiler::LogicalGreaterThan<Type::Int>,
1393 &LogicalNotEqual<Type::Int>, 1393 &GLSLDecompiler::LogicalNotEqual<Type::Int>,
1394 &LogicalGreaterEqual<Type::Int>, 1394 &GLSLDecompiler::LogicalGreaterEqual<Type::Int>,
1395 1395
1396 &LogicalLessThan<Type::Uint>, 1396 &GLSLDecompiler::LogicalLessThan<Type::Uint>,
1397 &LogicalEqual<Type::Uint>, 1397 &GLSLDecompiler::LogicalEqual<Type::Uint>,
1398 &LogicalLessEqual<Type::Uint>, 1398 &GLSLDecompiler::LogicalLessEqual<Type::Uint>,
1399 &LogicalGreaterThan<Type::Uint>, 1399 &GLSLDecompiler::LogicalGreaterThan<Type::Uint>,
1400 &LogicalNotEqual<Type::Uint>, 1400 &GLSLDecompiler::LogicalNotEqual<Type::Uint>,
1401 &LogicalGreaterEqual<Type::Uint>, 1401 &GLSLDecompiler::LogicalGreaterEqual<Type::Uint>,
1402 1402
1403 &Logical2HLessThan, 1403 &GLSLDecompiler::Logical2HLessThan,
1404 &Logical2HEqual, 1404 &GLSLDecompiler::Logical2HEqual,
1405 &Logical2HLessEqual, 1405 &GLSLDecompiler::Logical2HLessEqual,
1406 &Logical2HGreaterThan, 1406 &GLSLDecompiler::Logical2HGreaterThan,
1407 &Logical2HNotEqual, 1407 &GLSLDecompiler::Logical2HNotEqual,
1408 &Logical2HGreaterEqual, 1408 &GLSLDecompiler::Logical2HGreaterEqual,
1409 1409
1410 &F4Texture, 1410 &GLSLDecompiler::F4Texture,
1411 &F4TextureLod, 1411 &GLSLDecompiler::F4TextureLod,
1412 &F4TextureGather, 1412 &GLSLDecompiler::F4TextureGather,
1413 &F4TextureQueryDimensions, 1413 &GLSLDecompiler::F4TextureQueryDimensions,
1414 &F4TextureQueryLod, 1414 &GLSLDecompiler::F4TextureQueryLod,
1415 &F4TexelFetch, 1415 &GLSLDecompiler::F4TexelFetch,
1416 1416
1417 &Ipa, 1417 &GLSLDecompiler::Ipa,
1418 1418
1419 &Bra, 1419 &GLSLDecompiler::Bra,
1420 &PushFlowStack, // Ssy 1420 &GLSLDecompiler::PushFlowStack, // Ssy
1421 &PushFlowStack, // Brk 1421 &GLSLDecompiler::PushFlowStack, // Brk
1422 &PopFlowStack, // Sync 1422 &GLSLDecompiler::PopFlowStack, // Sync
1423 &PopFlowStack, // Brk 1423 &GLSLDecompiler::PopFlowStack, // Brk
1424 &Exit, 1424 &GLSLDecompiler::Exit,
1425 &Kil, 1425 &GLSLDecompiler::Kil,
1426 1426
1427 &EmitVertex, 1427 &GLSLDecompiler::EmitVertex,
1428 &EndPrimitive, 1428 &GLSLDecompiler::EndPrimitive,
1429 1429
1430 &YNegate, 1430 &GLSLDecompiler::YNegate,
1431 }; 1431 };
1432 1432
1433 std::string GetRegister(u32 index) const { 1433 std::string GetRegister(u32 index) const {
HIC SVNT DRACONES