Commit 8c2d9632 authored by Libretro-Admin's avatar Libretro-Admin
Browse files
parent 5c3c881c
......@@ -20,7 +20,7 @@ void update_e68k()
{
//Set the pending signal
//Is L register held here too ?
e68k_out=1;
e68k_out=true;
e68k_reg_L=aica_reg_L;
update_armintc();
......@@ -85,4 +85,4 @@ template u32 arm_ReadReg<4,u32>(u32 adr);
template void arm_WriteReg<1>(u32 adr,u8 data);
template void arm_WriteReg<2>(u32 adr,u16 data);
template void arm_WriteReg<4>(u32 adr,u32 data);
\ No newline at end of file
template void arm_WriteReg<4>(u32 adr,u32 data);
......@@ -33,7 +33,7 @@ protected:
class NaomiCartridge : public Cartridge
{
public:
NaomiCartridge(u32 size) : Cartridge(size), RomPioOffset(0), RomPioAutoIncrement(0), DmaOffset(0), DmaCount(0xffff) {}
NaomiCartridge(u32 size) : Cartridge(size), RomPioOffset(0), RomPioAutoIncrement(false), DmaOffset(0), DmaCount(0xffff) {}
virtual u32 ReadMem(u32 address, u32 size) override;
virtual void WriteMem(u32 address, u32 data, u32 size) override;
......
......@@ -684,7 +684,7 @@ void print_blocks()
if (print_stats)
{
f=fopen(get_writable_data_path("/blkmap.lst").c_str(),"w");
print_stats=0;
print_stats=false;
INFO_LOG(DYNAREC, "Writing blocks to %p", f);
}
......
......@@ -100,13 +100,13 @@ static void SetGPState(const PolyParam* gp)
if (pass == Pass::Depth)
{
CurrentShader = gl4GetProgram(Type == ListType_Punch_Through ? 1 : 0,
CurrentShader = gl4GetProgram(Type == ListType_Punch_Through ? true : false,
clipmode == TileClipping::Inside,
Type == ListType_Punch_Through ? gp->pcw.Texture : 0,
1,
Type == ListType_Punch_Through ? gp->pcw.Texture : false,
true,
gp->tsp.IgnoreTexA,
0,
0,
false,
2,
false, // TODO Can PT have two different textures for area 0 and 1 ??
false,
......@@ -125,7 +125,7 @@ static void SetGPState(const PolyParam* gp)
palette = BaseTextureCacheData::IsGpuHandledPaletted(gp->tsp, gp->tcw);
CurrentShader = gl4GetProgram(Type == ListType_Punch_Through ? 1 : 0,
CurrentShader = gl4GetProgram(Type == ListType_Punch_Through ? true : false,
clipmode == TileClipping::Inside,
gp->pcw.Texture,
gp->tsp.UseAlpha,
......@@ -786,6 +786,7 @@ void gl4DrawVmuTexture(u8 vmu_screen_number)
glBindVertexArray(gl4.vbo.main_vao);
gl4ShaderUniforms.trilinear_alpha = 1.0;
CurrentShader = gl4GetProgram(false,
0,
true,
......
......@@ -120,7 +120,7 @@ __forceinline
TileClipping clipmode = GetTileClip(gp->tileclip, ViewportMatrix, clip_rect);
bool palette = BaseTextureCacheData::IsGpuHandledPaletted(gp->tsp, gp->tcw);
CurrentShader = GetProgram(Type == ListType_Punch_Through ? 1 : 0,
CurrentShader = GetProgram(Type == ListType_Punch_Through ? true : false,
clipmode == TileClipping::Inside,
gp->pcw.Texture,
gp->tsp.UseAlpha,
......@@ -643,7 +643,7 @@ static void DrawQuad(GLuint texId, float x, float y, float w, float h, float u0,
ShaderUniforms.trilinear_alpha = 1.0;
PipelineShader *shader = GetProgram(0, false, 1, 0, 1, 0, 0, 2, false, false, false, false, false);
PipelineShader *shader = GetProgram(false, false, true, false, true, 0, false, 2, false, false, false, false, false);
glcache.UseProgram(shader->program);
glActiveTexture(GL_TEXTURE0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment