DXGL r555 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r554‎ | r555 | r556 >
Date:23:09, 14 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
@@ -121,7 +121,7 @@
122122 0xFFFFFFFF,
123123 0xFFFFFFFF,
124124 0xFFFFFFFF,
125 - 0x08000400,
 125+ 0xFFFFFFFF,
126126 0x00001001,
127127 0x88014000
128128 };
@@ -371,38 +371,38 @@
372372 "pixel = (dest ^ colorsizedest) ^ (pixel & (pattern | dest));\n",
373373 "pixel = dest ^ pixel ^ (pattern | (dest & pixel));\n",
374374 "pixel = (pattern & (dest ^ pixel)) ^ colorsizedest;\n",//9F
375 -"",//A0
376 -"",
377 -"",
378 -"",
379 -"",
380 -"",
381 -"",
382 -"",
383 -"",
384 -"",
 375+"pixel = dest & pattern;\n",//A0
 376+"pixel = (pattern ^ colorsizedest) ^ (dest | (pixel & (pattern ^ colorsizedest)));\n",
 377+"pixel = dest & (pattern | (pixel ^ colorsizedest));\n",
 378+"pixel = (dest ^ colorsizedest) ^ (pattern | (pixel ^ dest));\n",
 379+"pixel = (pattern ^ colorsizedest) ^ (dest | ((pixel | pattern) ^ colorsizedest));\n",
 380+"pixel = (pattern ^ colorsizedest) ^ dest;\n",
 381+"pixel = dest ^ (pixel & (pattern ^ colorsizedest));\n",
 382+"pixel = (pattern ^ colorsizedest) ^ (dest & (pixel | pattern));\n",
 383+"pixel = dest & (pattern | pixel);\n",
 384+"pixel = (dest ^ colorsizedest) ^ (pattern | pixel);\n",
385385 "pixel = dest;\n",
386 -"",
387 -"",
388 -"",
389 -"",
390 -"",//AF
391 -"",//B0
392 -"",
393 -"",
394 -"",
395 -"",
396 -"",
397 -"",
398 -"",
399 -"",
400 -"",
401 -"",
 386+"pixel = dest | ((pattern | pixel) ^ colorsizedest);\n",
 387+"pixel = pixel ^ (pattern & (dest ^ pixel));\n",
 388+"pixel = (dest ^ colorsizedest) ^ (pattern | (pixel & dest));\n",
 389+"pixel = dest | (pixel & (pattern ^ colorsizedest));\n",
 390+"pixel = dest | (pattern ^ colorsizedest);\n",//AF
 391+"pixel = pattern & (dest | (pixel ^ colorsizedest));\n",//B0
 392+"pixel = (pattern ^ colorsizedest) ^ (dest | (pixel ^ pattern));\n",
 393+"pixel = pixel ^ ((pixel ^ pattern) | (pixel ^ dest));\n",
 394+"pixel = (pixel & ((dest & pattern) ^ colorsizedest)) ^ colorsizedest;\n",
 395+"pixel = pattern ^ (pixel & (dest ^ colorsizedest));\n",
 396+"pixel = (dest ^ colorsizedest) ^ (pattern & (pixel | dest));\n",
 397+"pixel = dest ^ pattern ^ (pixel | (dest & pattern));\n",
 398+"pixel = (pixel & (dest ^ pattern)) ^ colorsizedest;\n",
 399+"pixel = pattern ^ (pixel & (dest ^ pattern));\n",
 400+"pixel = (dest ^ colorsizedest) ^ (pixel | (pattern & dest));\n",
 401+"pixel = dest | (pattern & (pixel ^ colorsizedest));\n",
402402 "pixel = dest | (pixel ^ colorsizedest);\n",//BB MERGEPAINT
403 -"",
404 -"",
405 -"",
406 -"",//BF
 403+"pixel = pixel ^ (pattern & ((dest & pixel) ^ colorsizedest));\n",
 404+"pixel = ((pixel ^ dest) & (pattern ^ dest)) ^ colorsizedest;\n",
 405+"pixel = dest | (pattern ^ pixel);\n",
 406+"pixel = dest | ((pattern & pixel) ^ colorsizedest);\n",//BF
407407 "pixel = pixel & pattern;\n",//C0 MERGECOPY
408408 "",
409409 "",