tobid7/palladium
1
0
Fork 0
Code Issues 7 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: Dev 0.7 rewrite #15

Draft
tobid7 wants to merge 85 commits from dev-0.7-rewrite into stable
pull from: dev-0.7-rewrite
merge into: :stable
Conversation 0 Commits 85 Files Changed 217
+6 -1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 859a4c96ae - Show all commits
backends/source/gfx_directx9.cpp
+4
View File
@@ -175,6 +175,10 @@ void GfxDirectX9::SysReset() {
impl->Device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
impl->Device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
impl->Device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
impl->Device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
impl->Device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
impl->Device->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_LINEAR);
}
Li::Texture GfxDirectX9::LoadTexture(const std::vector<PD::u8>& pixels, int w,
include/pd/drivers/gfx.hpp
+2 -1
View File
@@ -125,7 +125,8 @@ class GfxDriverBase : public GfxDriver {
while (index < commands.size() &&
CurrentTexIsSDF == commands[index].SDF &&
(CurrentTex == commands[index].Tex ||
(CurrentTex == pWhite.GetID() && commands[index].Tex == 0))) {
(CurrentTex == pWhite.GetID() && commands[index].Tex == 0)) &&
commands[index].FirstIndex == startidx + num_indices) {
num_indices += commands[index].IndexCount;
index++;
}