DXGL r557 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r556‎ | r557 | r558 >
Date:23:47, 15 October 2014
Author:admin
Status:new
Tags:
Comment:
Add remaining raster operations.
Modified paths:
  • /ddraw/ShaderGen2D.cpp (modified) (history)

Diff [purge]

Index: ddraw/ShaderGen2D.cpp
@@ -123,7 +123,7 @@
124124 0xFFFFFFFF,
125125 0xFFFFFFFF,
126126 0xFFFFFFFF,
127 - 0x88014000
 127+ 0xFFFFFFFF
128128 };
129129
130130 const DWORD supported_rops_gl2[8] = {
@@ -435,37 +435,37 @@
436436 "pixel = pixel | (dest ^ colorsizedest);\n",
437437 "pixel = pixel | (dest ^ pattern);\n",
438438 "pixel = pixel | ((dest & pattern) ^ colorsizedest);\n",//DF
439 -"",//E0
440 -"",
441 -"",
442 -"",
443 -"",
444 -"",
445 -"",
446 -"",
447 -"",
448 -"",
449 -"",
450 -"",
451 -"",
452 -"",
 439+"pixel = pattern & (dest | pixel);\n",//E0
 440+"pixel = (pattern ^ colorsizedest) ^ (dest | pixel);\n",
 441+"pixel = dest ^ (pixel & (pattern ^ dest));\n",
 442+"pixel = (pattern ^ colorsizedest) ^ (pixel | (dest & pattern));\n",
 443+"pixel = pixel ^ (dest & (pattern ^ pixel));\n",
 444+"pixel = (pattern ^ colorsizedest) ^ (dest | (pixel & pattern));\n",
 445+"pixel = pixel ^ (dest & ((pattern & pixel) ^ colorsizedest));\n",
 446+"pixel = ((pixel ^ pattern) & (dest ^ pattern)) ^ colorsizedest;\n",
 447+"pixel = pixel ^ ((pixel ^ pattern) & (pixel ^ dest));\n",
 448+"pixel = (dest ^ colorsizedest) ^ pixel ^ (pattern & ((pixel & dest) ^ colorsizedest));\n",
 449+"pixel = dest | (pattern & pixel);\n",
 450+"pixel = dest | ((pattern ^ pixel) ^ colorsizedest);\n",
 451+"pixel = pixel | (dest & pattern);\n",
 452+"pixel = pixel | ((dest ^ pattern) ^ colorsizedest);\n",
453453 "pixel = pixel | dest;\n",//EE SRCPAINT
454 -"",//EF
 454+"pixel = pixel | dest | (pattern ^ colorsizedest);\n",//EF
455455 "pixel = pattern;\n",//F0 PATCOPY
456 -"",
457 -"",
458 -"",
459 -"",
460 -"",
461 -"",
462 -"",
463 -"",
464 -"",
465 -"",
 456+"pixel = pattern | ((dest | pixel) ^ colorsizedest);\n",
 457+"pixel = pattern | (dest & (pixel ^ colorsizedest));\n",
 458+"pixel = pattern | (pixel ^ colorsizedest);\n",
 459+"pixel = pattern | (pixel & (dest ^ colorsizedest));\n",
 460+"pixel = pattern | (dest ^ colorsizedest);\n",
 461+"pixel = pattern | (dest ^ pixel);\n",
 462+"pixel = pattern | ((pixel & dest) ^ colorsizedest);\n",
 463+"pixel = pattern | (dest & pixel);\n",
 464+"pixel = pattern | ((dest ^ pixel) ^ colorsizedest);\n",
 465+"pixel = dest | pattern;\n",
466466 "pixel = dest | pattern | (pixel ^ colorsizedest);\n",//FB PATPAINT
467 -"",
468 -"",
469 -"",
 467+"pixel = pattern | pixel;\n",
 468+"pixel = pattern | pixel | (dest ^ colorsizedest);\n",
 469+"pixel = pattern | dest | pixel;\n",
470470 "pixel = colorsizedest;\n",//FF WHITENESS
471471 };
472472