zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Hooking the new RGB256k drawer to triangle drawer in place of RGB32k.

Browse source
This commit is contained in:
Rachael Alexanderson 2016-12-19 11:27:46 -05:00
parent 978152f483
commit 5ffee5231f
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/r_drawers.h
View file

@ -247,7 +247,7 @@ struct TriDrawTriangleArgs
uint8_t stencilWriteValue; uint8_t stencilWriteValue;
uint32_t *subsectorGBuffer; uint32_t *subsectorGBuffer;
const uint8_t *colormaps; const uint8_t *colormaps;
const uint8_t *RGB32k; const uint8_t *RGB256k;
const uint8_t *BaseColors; const uint8_t *BaseColors;
}; };

2
src/r_poly_triangle.cpp
View file

@ -130,7 +130,7 @@ void PolyTriangleDrawer::draw_arrays(const PolyDrawArgs &drawargs, WorkerThreadD
args.stencilMasks = PolyStencilBuffer::Instance()->Masks(); args.stencilMasks = PolyStencilBuffer::Instance()->Masks();
args.subsectorGBuffer = PolySubsectorGBuffer::Instance()->Values(); args.subsectorGBuffer = PolySubsectorGBuffer::Instance()->Values();
args.colormaps = drawargs.colormaps; args.colormaps = drawargs.colormaps;
args.RGB32k = RGB32k.All; args.RGB256k = RGB256k.All;
args.BaseColors = (const uint8_t *)GPalette.BaseColors; args.BaseColors = (const uint8_t *)GPalette.BaseColors;
bool ccw = drawargs.ccw; bool ccw = drawargs.ccw;

4
tools/drawergen/fixedfunction/drawtrianglecodegen.cpp
View file

@ -492,7 +492,7 @@ SSAInt DrawTriangleCodegen::ToPal8(SSAVec4i c)
SSAInt red = SSAInt::clamp(c[0], SSAInt(0), SSAInt(255)); SSAInt red = SSAInt::clamp(c[0], SSAInt(0), SSAInt(255));
SSAInt green = SSAInt::clamp(c[1], SSAInt(0), SSAInt(255)); SSAInt green = SSAInt::clamp(c[1], SSAInt(0), SSAInt(255));
SSAInt blue = SSAInt::clamp(c[2], SSAInt(0), SSAInt(255)); SSAInt blue = SSAInt::clamp(c[2], SSAInt(0), SSAInt(255));
return RGB32k[((blue >> 3) * 32 + (green >> 3)) * 32 + (red >> 3)].load(true).zext_int(); return RGB256k[((blue >> 2) * 64 + (green >> 2)) * 64 + (red >> 2)].load(true).zext_int();
} }
SSAInt DrawTriangleCodegen::ProcessPixel8(SSAInt bg, SSAInt *varying) SSAInt DrawTriangleCodegen::ProcessPixel8(SSAInt bg, SSAInt *varying)
@ -631,7 +631,7 @@ void DrawTriangleCodegen::LoadArgs(SSAValue args, SSAValue thread_data)
if (!truecolor) if (!truecolor)
{ {
Colormaps = args[0][20].load(true); Colormaps = args[0][20].load(true);
RGB32k = args[0][21].load(true); RGB256k = args[0][21].load(true);
BaseColors = args[0][22].load(true); BaseColors = args[0][22].load(true);
} }

2
tools/drawergen/fixedfunction/drawtrianglecodegen.h
View file

@ -95,7 +95,7 @@ private:
SSABool is_fixed_light; SSABool is_fixed_light;
SSAUBytePtr Colormaps; SSAUBytePtr Colormaps;
SSAUBytePtr RGB32k; SSAUBytePtr RGB256k;
SSAUBytePtr BaseColors; SSAUBytePtr BaseColors;
SSAInt numSpans; SSAInt numSpans;

2
tools/drawergen/llvmdrawers.cpp
View file

@ -430,7 +430,7 @@ llvm::Type *LLVMDrawers::GetTriDrawTriangleArgs(llvm::LLVMContext &context)
elements.push_back(llvm::Type::getInt8Ty(context)); // uint8_t stencilWriteValue; elements.push_back(llvm::Type::getInt8Ty(context)); // uint8_t stencilWriteValue;
elements.push_back(llvm::Type::getInt32PtrTy(context)); // uint32_t *subsectorGBuffer; elements.push_back(llvm::Type::getInt32PtrTy(context)); // uint32_t *subsectorGBuffer;
elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *colormaps; elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *colormaps;
elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *RGB32k; elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *RGB256k;
elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *BaseColors; elements.push_back(llvm::Type::getInt8PtrTy(context)); // const uint8_t *BaseColors;
TriDrawTriangleArgs = llvm::StructType::create(context, elements, "TriDrawTriangle", false)->getPointerTo(); TriDrawTriangleArgs = llvm::StructType::create(context, elements, "TriDrawTriangle", false)->getPointerTo();
return TriDrawTriangleArgs; return TriDrawTriangleArgs;