DXGL r556 - Code Review

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

Diff [purge]

Index: ddraw/ShaderGen2D.cpp
@@ -122,7 +122,7 @@
123123 0xFFFFFFFF,
124124 0xFFFFFFFF,
125125 0xFFFFFFFF,
126 - 0x00001001,
 126+ 0xFFFFFFFF,
127127 0x88014000
128128 };
129129
@@ -404,37 +404,37 @@
405405 "pixel = dest | (pattern ^ pixel);\n",
406406 "pixel = dest | ((pattern & pixel) ^ colorsizedest);\n",//BF
407407 "pixel = pixel & pattern;\n",//C0 MERGECOPY
408 -"",
409 -"",
410 -"",
411 -"",
412 -"",
413 -"",
414 -"",
415 -"",
416 -"",
417 -"",
418 -"",
419 -"",//CC SRCCOPY pixel=pixel
420 -"",
421 -"",
422 -"",//CF
423 -"",//D0
424 -"",
425 -"",
426 -"",
427 -"",
428 -"",
429 -"",
430 -"",
431 -"",
432 -"",
433 -"",
434 -"",
435 -"",
436 -"",
437 -"",
438 -"",//DF
 408+"pixel = (pixel ^ colorsizedest) ^ (pattern | (dest & (pixel ^ colorsizedest)));\n",
 409+"pixel = (pixel ^ colorsizedest) ^ (pattern | ((dest | pixel) ^ colorsizedest));\n",
 410+"pixel = (pattern ^ colorsizedest) ^ pixel;\n",
 411+"pixel = pixel & (pattern | (dest ^ colorsizedest));\n",
 412+"pixel = (pixel ^ colorsizedest) ^ (pattern | (dest ^ pixel));\n",
 413+"pixel = pixel ^ (dest & (pattern ^ colorsizedest));\n",
 414+"pixel = (pattern ^ colorsizedest) ^ (pixel & (dest | pattern));\n",
 415+"pixel = pixel & (dest | pattern);\n",
 416+"pixel = (pixel ^ colorsizedest) ^ (pattern | dest);\n",
 417+"pixel = dest ^ (pattern & (pixel ^ dest));\n",
 418+"pixel = (pixel ^ colorsizedest) ^ (pattern | (dest & pixel));\n",
 419+"//ROP is a no-op for srccopy\n",//CC SRCCOPY pixel=pixel
 420+"pixel = pixel | ((dest | pattern) ^ colorsizedest);\n",
 421+"pixel = pixel | (dest & (pattern ^ colorsizedest));\n",
 422+"pixel = pixel | (pattern ^ colorsizedest);\n",//CF
 423+"pixel = pattern & (pixel | (dest ^ colorsizedest));\n",//D0
 424+"pixel = (pattern ^ colorsizedest) ^ (pixel | (dest ^ pattern));\n",
 425+"pixel = pattern ^ (dest & (pixel ^ colorsizedest));\n",
 426+"pixel = (pixel ^ colorsizedest) ^ (pattern & (dest | pixel));\n",
 427+"pixel = pixel ^ ((pixel ^ pattern) & (dest ^ pattern));\n",
 428+"pixel = (dest & ((pattern & pixel) ^ colorsizedest)) ^ colorsizedest;\n",
 429+"pixel = pixel ^ pattern ^ (dest | (pattern & pixel));\n",
 430+"pixel = (dest & (pattern ^ pixel)) ^ colorsizedest;\n",
 431+"pixel = pattern ^ (dest & (pixel ^ pattern));\n",
 432+"pixel = (pixel ^ colorsizedest) ^ (dest | (pattern & pixel));\n",
 433+"pixel = dest ^ (pattern & ((pixel & dest) ^ colorsizedest));\n",
 434+"pixel = ((pixel ^ pattern) & (pixel ^ dest)) ^ colorsizedest;\n",
 435+"pixel = pixel | (pattern & (dest ^ colorsizedest));\n",
 436+"pixel = pixel | (dest ^ colorsizedest);\n",
 437+"pixel = pixel | (dest ^ pattern);\n",
 438+"pixel = pixel | ((dest & pattern) ^ colorsizedest);\n",//DF
439439 "",//E0
440440 "",
441441 "",