~ubuntu-branches/debian/experimental/mednafen/experimental

Viewing changes to src/psx/gpu_polygon.inc

Committer: Package Import Robot
Author(s): Stephen Kitt
Date: 2012-01-31 07:21:35 UTC
mfrom: (1.2.8)
Revision ID: package-import@ubuntu.com-20120131072135-es3dj12y00xcnrsk

Tags: 0.9.19-1

* New upstream WIP version.
* Update copyright information.
* Refresh use-system-tremor.patch and remove psx-big-endian-only.patch.
* Add spelling-fixes.patch based on Lintian's recommendations.
* Build-depend on debhelper 9 or later and remove corresponding Lintian
override.

files added:
.pc/spelling-fixes.patch

.pc/spelling-fixes.patch/src

.pc/spelling-fixes.patch/src/vb

.pc/spelling-fixes.patch/src/vb/vb.cpp

debian/gbp.conf

debian/patches/spelling-fixes.patch

intl/setlocale.c

intl/threadlib.c

m4/fcntl-o.m4

m4/threadlib.m4

src/Stream.cpp

src/Stream.h

src/cdrom/CDAccess.cpp

src/cdrom/CDAccess.h

src/cdrom/CDAccess_Image.cpp

src/cdrom/CDAccess_Image.h

src/cdrom/CDAccess_Physical.cpp

src/cdrom/CDAccess_Physical.h

src/cdrom/CDUtility.cpp

src/cdrom/CDUtility.h

src/pce/mcgenjin.cpp

src/pce/mcgenjin.h

src/pce/mcgenjin_ym2413.inc

src/psx/NOTES

src/psx/SOURCES

src/psx/gpu_line.inc

src/psx/gpu_polygon.inc

src/psx/gpu_sprite.inc

src/psx/gte_divrecip.inc

src/psx/input/dualanalog.cpp

src/psx/input/dualanalog.h

src/psx/input/memcard.cpp

src/psx/input/memcard.h

src/psx/input/mouse.cpp

src/psx/input/mouse.h

src/psx/input/multitap.cpp

src/psx/input/multitap.h

files removed:
.pc/psx-big-endian-only.patch

.pc/psx-big-endian-only.patch/configure.ac

debian/patches/psx-big-endian-only.patch

debian/source/lintian-overrides

po/Makevars.template

src/cdrom/cdromfile-stuff.h

src/cdrom/cdromfile.cpp

src/cdrom/cdromfile.h

files modified:
.pc/applied-patches

.pc/use-system-tremor.patch/configure.ac

.pc/use-system-tremor.patch/src/Makefile.am

.pc/use-system-tremor.patch/src/cdrom/audioreader.cpp

.pc/use-system-tremor.patch/src/tremor/Makefile.in

ABOUT-NLS

ChangeLog

Documentation/docgen.inc

Documentation/gb.html

Documentation/gba.html

Documentation/gg.html

Documentation/lynx.html

Documentation/lynx.php

Documentation/md.html

Documentation/mednafen.html

Documentation/mednafen.php

Documentation/nes.html

Documentation/ngp.html

Documentation/pce.html

Documentation/pce_fast.html

Documentation/pcfx.html

Documentation/psx.html

Documentation/psx.php

Documentation/settings.def

Documentation/sms.html

Documentation/snes.html

Documentation/vb.html

Documentation/wswan.html

Documentation/wswan.php

Makefile.in

README

TODO

acinclude.m4

aclocal.m4

config.guess

config.rpath

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/patches/series

debian/patches/use-system-tremor.patch

include/blip/Blip_Buffer.h

include/config.h.in

include/config.h.in~

intl/ChangeLog

intl/Makefile.in

intl/VERSION

intl/bindtextdom.c

intl/config.charset

intl/dcigettext.c

intl/gettextP.h

intl/intl-compat.c

intl/intl-exports.c

intl/l10nflist.c

intl/langprefs.c

intl/libgnuintl.h.in

intl/libintl.rc

intl/loadmsgcat.c

intl/localcharset.c

intl/localename.c

intl/lock.c

intl/lock.h

intl/log.c

intl/os2compat.h

intl/printf-args.c

intl/printf-args.h

intl/printf-parse.c

intl/printf-parse.h

intl/printf.c

intl/relocatable.c

intl/relocatable.h

intl/tsearch.c

intl/tsearch.h

intl/vasnprintf.c

intl/vasnwprintf.h

intl/wprintf-parse.h

intl/xsize.h

ltmain.sh

m4/ChangeLog

m4/codeset.m4

m4/gettext.m4

m4/glibc2.m4

m4/glibc21.m4

m4/iconv.m4

m4/intdiv0.m4

m4/intl.m4

m4/intldir.m4

m4/intlmacosx.m4

m4/intmax.m4

m4/inttypes-pri.m4

m4/inttypes_h.m4

m4/lcmessage.m4

m4/lib-ld.m4

m4/lib-link.m4

m4/lib-prefix.m4

m4/lock.m4

m4/longlong.m4

m4/nls.m4

m4/po.m4

m4/printf-posix.m4

m4/progtest.m4

m4/size_max.m4

m4/stdint_h.m4

m4/uintmax_t.m4

m4/visibility.m4

m4/wchar_t.m4

m4/wint_t.m4

m4/xsize.m4

po/ChangeLog

po/Makefile.in.in

po/Makevars

po/POTFILES.in

po/Rules-quot

po/de.gmo

po/de.po

po/es.gmo

po/es.po

po/mednafen.pot

po/ru.gmo

po/ru.po

src/FileWrapper.cpp

src/FileWrapper.h

src/Makefile.am

src/Makefile.in

src/cdplay.cpp

src/cdrom/Makefile.am.inc

src/cdrom/SimpleFIFO.h

src/cdrom/audioreader.cpp

src/cdrom/cdromif.cpp

src/cdrom/cdromif.h

src/cdrom/crc32.cpp

src/cdrom/dvdisaster.h

src/cdrom/pcecd.cpp

src/cdrom/recover-raw.cpp

src/cdrom/scsicd-pce-commands.inc

src/cdrom/scsicd.cpp

src/cdrom/scsicd.h

src/compress/ioapi.c

src/compress/ioapi.h

src/compress/unzip.c

src/compress/unzip.h

src/debug.h

src/demo/Makefile.in

src/desa68/Makefile.in

src/drivers/Makefile.in

src/drivers/help.cpp

src/drivers/input-config.cpp

src/drivers/input-config.h

src/drivers/input-default-buttons.h

src/drivers/input.cpp

src/drivers/input.h

src/drivers/joystick.cpp

src/drivers/joystick.h

src/drivers/main.cpp

src/drivers/nongl.cpp

src/drivers/opengl.cpp

src/drivers/opengl.h

src/drivers/shader.cpp

src/drivers/shader.h

src/drivers/sound.cpp

src/drivers/video.cpp

src/drivers/video.h

src/file.cpp

src/file.h

src/gb/Makefile.in

src/gb/gb.cpp

src/gb/gb.h

src/gb/gbGlobals.cpp

src/gb/gbGlobals.h

src/gb/gfx.cpp

src/gb/memory.cpp

src/gb/memory.h

src/gb/sound.cpp

src/gb/sound.h

src/gb/z80.cpp

src/gb/z80.h

src/gba/GBA.cpp

src/gba/GBA.h

src/gba/GBAinline.cpp

src/gba/GBAinline.h

src/gba/Gfx.cpp

src/gba/Gfx.h

src/gba/Globals.cpp

src/gba/Globals.h

src/gba/Makefile.in

src/gba/Mode0.cpp

src/gba/Mode1.cpp

src/gba/Mode2.cpp

src/gba/Mode3.cpp

src/gba/Mode4.cpp

src/gba/Mode5.cpp

src/gba/Port.h

src/gba/RTC.cpp

src/gba/RTC.h

src/gba/Sound.cpp

src/gba/Sound.h

src/gba/arm.cpp

src/gba/arm.h

src/gba/bios.cpp

src/gba/bios.h

src/gba/eeprom.cpp

src/gba/eeprom.h

src/gba/flash.cpp

src/gba/flash.h

src/gba/gfx-draw.h

src/gba/sram.cpp

src/gba/sram.h

src/gba/thumb.cpp

src/gba/thumb.h

src/general.cpp

src/general.h

src/git.h

src/hw_cpu/Makefile.in

src/hw_misc/Makefile.in

src/hw_misc/arcade_card/arcade_card.cpp

src/hw_sound/Makefile.in

src/hw_sound/ym2413/emu2413.cpp

src/hw_video/Makefile.in

src/lepacker.h

src/lynx/Makefile.in

src/lynx/susie.cpp

src/math_ops.h

src/md/Makefile.in

src/md/cart/map_svp.cpp

src/md/cd/cd.cpp

src/md/cd/cd.h

src/md/cd/cdc_cdd.cpp

src/md/debug.cpp

src/md/system.cpp

src/md/vdp.cpp

src/md/vdp_run.inc

src/mednafen-driver.h

src/mednafen.cpp

src/mpcdec/Makefile.in

src/nes/Makefile.in

src/nes/boards/emutypes.h

src/nes/boards/fme7.cpp

src/nes/boards/mmc5.cpp

src/nes/cart.cpp

src/nes/fds.cpp

src/nes/filter.cpp

src/nes/filter.h

src/nes/input/arkanoid.cpp

src/nes/input/cursor.cpp

src/nes/input/oekakids.cpp

src/nes/input/shadow.cpp

src/nes/input/zapper.cpp

src/nes/nes.cpp

src/nes/ntsc/nes_ntsc.cpp

src/nes/ppu/ppu-fastrl.h

src/nes/ppu/ppu.cpp

src/nes/ppu/ppu.h

src/nes/sound.cpp

src/nes/unif.cpp

src/nes/vsuni.cpp

src/ngp/Makefile.in

src/ngp/mem.cpp

src/pce/Makefile.am

src/pce/Makefile.in

src/pce/hes.cpp

src/pce/huc.cpp

src/pce/huc.h

src/pce/pce.cpp

src/pce/vce_sync.inc

src/pce_fast/Makefile.in

src/pce_fast/hes.cpp

src/pce_fast/pce.cpp

src/pce_fast/vdc.cpp

src/pcfx/Makefile.in

src/pcfx/fxscsi.cpp

src/pcfx/huc6273.cpp

src/pcfx/king.cpp

src/pcfx/pcfx.cpp

src/pcfx/rainbow.cpp

src/player.cpp

src/psx/.Tpo

src/psx/Makefile.am

src/psx/Makefile.in

src/psx/README.NOW

src/psx/cdc.cpp

src/psx/cdc.h

src/psx/cpu.cpp

src/psx/cpu.h

src/psx/debug.cpp

src/psx/debug.h

src/psx/dis.cpp

src/psx/dma.cpp

src/psx/dma.h

src/psx/frontio.cpp

src/psx/frontio.h

src/psx/gpu.cpp

src/psx/gpu.h

src/psx/gpu_command_table.inc

src/psx/gte.cpp

src/psx/input/gamepad.cpp

src/psx/irq.cpp

src/psx/mdec.cpp

src/psx/mdec.h

src/psx/psx.cpp

src/psx/psx.h

src/psx/sio.cpp

src/psx/sio.h

src/psx/spu.cpp

src/psx/spu.h

src/psx/spu_reverb.inc

src/psx/timer.cpp

src/psx/timer.h

src/qtrecord.cpp

src/settings.cpp

src/sexyal/Makefile.in

src/sms/Makefile.in

src/sms/hvc.inc

src/sms/pio.cpp

src/sms/render.cpp

src/sms/sound.cpp

src/sms/system.cpp

src/sms/vdp.cpp

src/sms/vdp.h

src/snes/Makefile.in

src/snes/interface.cpp

src/sound/Blip_Buffer.cpp

src/sound/Makefile.in

src/sound/WAVRecord.cpp

src/state.cpp

src/tests.cpp

src/trio/Makefile.in

src/vb/Makefile.in

src/vb/vb.cpp

src/video/surface.cpp

src/video/tblur.cpp

src/video/text.cpp

src/wswan/Makefile.in

src/wswan/dis/opcodes.inc

src/wswan/main.cpp

src/wswan/memory.cpp

src/wswan/memory.h

Show diffs side-by-side

added added

removed removed

src/psx/gpu_polygon.inc

struct tri_vertex

{

int32 x, y;

int32 u, v;

int32 r, g, b;

};

struct i_group

{

int32 u, v;

int32 r, g, b;

int32 dummy0[3];

};

struct i_deltas

{

int32 du_dx, dv_dx;

int32 dr_dx, dg_dx, db_dx;

int32 dummy0[3];

int32 du_dy, dv_dy;

int32 dr_dy, dg_dy, db_dy;

int32 dummy1[3];

};

static INLINE int64 MakePolyXFP(int32 x)

{

return ((int64)x << 32) + ((1LL << 32) - (1 << 11));

}

static INLINE int64 MakePolyXFPStep(int32 dx, int32 dy)

{

int64 ret;

int64 dx_ex = (int64)dx << 32;

if(dx_ex < 0)

dx_ex -= dy - 1;

if(dx_ex > 0)

dx_ex += dy - 1;

ret = dx_ex / dy;

return(ret);

}

static INLINE int32 GetPolyXFP_Int(int64 xfp)

{

return(xfp >> 32);

}

//#define CALCIS(x,y) ( A.x * (B.y - C.y) + B.x * (C.y - A.y) + C.x * (A.y - B.y) )

#define CALCIS(x,y) (((B.x - A.x) * (C.y - B.y)) - ((C.x - B.x) * (B.y - A.y)))

static INLINE bool CalcIDeltas(i_deltas &idl, const tri_vertex &A, const tri_vertex &B, const tri_vertex &C)

{

int64 num = ((int64)COORD_MF_INT(1)) << 32;

int64 denom = CALCIS(x, y);

int64 one_div;

if(!denom)

return(false);

//num -= abs(denom) - 1;

// num += abs(denom) >> 1;

one_div = num / denom;

idl.dr_dx = ((one_div * CALCIS(r, y)) + 0x00000000) >> 32;

idl.dr_dy = ((one_div * CALCIS(x, r)) + 0x00000000) >> 32;

idl.dg_dx = ((one_div * CALCIS(g, y)) + 0x00000000) >> 32;

idl.dg_dy = ((one_div * CALCIS(x, g)) + 0x00000000) >> 32;

idl.db_dx = ((one_div * CALCIS(b, y)) + 0x00000000) >> 32;

idl.db_dy = ((one_div * CALCIS(x, b)) + 0x00000000) >> 32;

idl.du_dx = ((one_div * CALCIS(u, y)) + 0x00000000) >> 32;

idl.du_dy = ((one_div * CALCIS(x, u)) + 0x00000000) >> 32;

idl.dv_dx = ((one_div * CALCIS(v, y)) + 0x00000000) >> 32;

idl.dv_dy = ((one_div * CALCIS(x, v)) + 0x00000000) >> 32;

// printf(" du_dx=%08x, du_dy=%08x\n", idl.du_dx, idl.du_dy);

return(true);

}

#undef CALCIS

template<bool goraud, bool textured>

static INLINE void AddIDeltas_DX(i_group &ig, const i_deltas &idl)

{

if(textured)

{

ig.u += idl.du_dx;

ig.v += idl.dv_dx;

}

if(goraud)

{

100

ig.r += idl.dr_dx;

101

ig.g += idl.dg_dx;

102

ig.b += idl.db_dx;

103

}

104

}

105

106

template<bool goraud, bool textured>

107

static INLINE void AddIDeltas_DY(i_group &ig, const i_deltas &idl, int32 count = 1)

108

{

109

if(textured)

110

{

111

ig.u += idl.du_dy * count;

112

ig.v += idl.dv_dy * count;

113

}

114

115

if(goraud)

116

{

117

ig.r += idl.dr_dy * count;

118

ig.g += idl.dg_dy * count;

119

ig.b += idl.db_dy * count;

120

}

121

}

122

123

template<bool goraud, bool textured, int BlendMode, bool TexMult, uint32 TexMode_TA, bool MaskEval_TA>

124

INLINE void PS_GPU::DrawSpan(int y, uint32 clut_offset, const int32 x_start, const int32 x_bound, const int32 bv_x, i_group ig, const i_deltas &idl)

125

{

126

int32 xs = x_start, xb = x_bound;

127

128

if(LineSkipTest(y))

129

return;

130

131

if(xs < xb) // (xs != xb)

132

{

133

if(xs < ClipX0)

134

xs = ClipX0;

135

136

if(xb > (ClipX1 + 1))

137

xb = ClipX1 + 1;

138

139

if(xs < xb)

140

DrawTimeAvail -= (xb - xs) * ((BlendMode >= 0) ? 2 : 1);

141

142

if(textured)

143

{

144

ig.u += (xs - bv_x) * idl.du_dx;

145

ig.v += (xs - bv_x) * idl.dv_dx;

146

}

147

148

if(goraud)

149

{

150

ig.r += (xs - bv_x) * idl.dr_dx;

151

ig.g += (xs - bv_x) * idl.dg_dx;

152

ig.b += (xs - bv_x) * idl.db_dx;

153

}

154

155

for(int32 x = xs; x < xb; x++)

156

{

157

uint32 r, g, b;

158

159

if(goraud)

160

{

161

r = RGB8SAT[COORD_GET_INT(ig.r)];

162

g = RGB8SAT[COORD_GET_INT(ig.g)];

163

b = RGB8SAT[COORD_GET_INT(ig.b)];

164

}

165

else

166

{

167

r = COORD_GET_INT(ig.r);

168

g = COORD_GET_INT(ig.g);

169

b = COORD_GET_INT(ig.b);

170

}

171

172

if(textured)

173

{

174

uint16 fbw = GetTexel<TexMode_TA>(clut_offset, COORD_GET_INT(ig.u), COORD_GET_INT(ig.v));

175

176

if(fbw)

177

{

178

if(TexMult)

179

{

180

if(dtd)

181

fbw = ModTexel(fbw, r, g, b, x & 3, y & 3);

182

else

183

fbw = ModTexel(fbw, r, g, b, 3, 2); //x & 3, y & 3);

184

}

185

PlotPixel<BlendMode, MaskEval_TA, true>(x, y, fbw);

186

}

187

}

188

else

189

{

190

uint16 pix = 0x8000;

191

192

if(goraud && dtd)

193

{

194

pix |= DitherLUT[y & 3][x & 3][r] << 0;

195

pix |= DitherLUT[y & 3][x & 3][g] << 5;

196

pix |= DitherLUT[y & 3][x & 3][b] << 10;

197

}

198

else

199

{

200

pix |= (r >> 3) << 0;

201

pix |= (g >> 3) << 5;

202

pix |= (b >> 3) << 10;

203

}

204

205

PlotPixel<BlendMode, MaskEval_TA, false>(x, y, pix);

206

}

207

208

AddIDeltas_DX<goraud, textured>(ig, idl);

209

//AddStep<goraud, textured>(perp_coord, perp_step);

210

}

211

}

212

}

213

214

template<bool goraud, bool textured, int BlendMode, bool TexMult, uint32 TexMode_TA, bool MaskEval_TA>

215

void PS_GPU::DrawTriangle(tri_vertex *vertices, uint32 clut)

216

{

217

i_deltas idl;

218

219

#if 0

220

vertices[0].y = COORD_MF_INT(rand());

221

vertices[1].y = COORD_MF_INT(rand());

222

vertices[2].y = COORD_MF_INT(rand());

223

224

vertices[0].x = COORD_MF_INT(rand());

225

vertices[1].x = COORD_MF_INT(rand());

226

vertices[2].x = COORD_MF_INT(rand());

227

#endif

228

229

if(vertices[2].y < vertices[1].y)

230

{

231

tri_vertex tmp = vertices[1];

232

vertices[1] = vertices[2];

233

vertices[2] = tmp;

234

}

235

236

if(vertices[1].y < vertices[0].y)

237

{

238

tri_vertex tmp = vertices[0];

239

vertices[0] = vertices[1];

240

vertices[1] = tmp;

241

}

242

243

if(vertices[2].y < vertices[1].y)

244

{

245

tri_vertex tmp = vertices[1];

246

vertices[1] = vertices[2];

247

vertices[2] = tmp;

248

}

249

250

if(vertices[0].y == vertices[2].y)

251

return;

252

253

if((vertices[2].y - vertices[0].y) >= 1024)

254

{

255

PSX_WARNING("[GPU] Triangle height too large: %d", (vertices[2].y - vertices[0].y));

256

return;

257

}

258

259

if(abs(vertices[2].x - vertices[0].x) >= 1024 ||

260

abs(vertices[2].x - vertices[1].x) >= 1024 ||

261

abs(vertices[1].x - vertices[0].x) >= 1024)

262

{

263

PSX_WARNING("[GPU] Triangle width too large: %d %d %d", abs(vertices[2].x - vertices[0].x), abs(vertices[2].x - vertices[1].x), abs(vertices[1].x - vertices[0].x));

264

return;

265

}

266

267

if(!CalcIDeltas(idl, vertices[0], vertices[1], vertices[2]))

268

return;

269

270

// [0] should be top vertex, [2] should be bottom vertex, [1] should be off to the side vertex.

271

272

273

int32 y_start = vertices[0].y;

274

int32 y_middle = vertices[1].y;

275

int32 y_bound = vertices[2].y;

276

277

int64 base_coord;

278

int64 base_step;

279

280

int64 bound_coord_ul;

281

int64 bound_coord_us;

282

283

int64 bound_coord_ll;

284

int64 bound_coord_ls;

285

286

bool right_facing;

287

//bool bottom_up;

288

i_group ig;

289

290

ig.u = COORD_MF_INT(vertices[0].u) + (1 << (COORD_FBS - 1));

291

ig.v = COORD_MF_INT(vertices[0].v) + (1 << (COORD_FBS - 1));

292

ig.r = COORD_MF_INT(vertices[0].r);

293

ig.g = COORD_MF_INT(vertices[0].g);

294

ig.b = COORD_MF_INT(vertices[0].b);

295

296

base_coord = MakePolyXFP(vertices[0].x); //COORD_MF_INT(vertices[0].x) + ((1 << COORD_FBS) - 1);

297

base_step = MakePolyXFPStep((vertices[2].x - vertices[0].x), (vertices[2].y - vertices[0].y)); //ROUND_HELPER(COORD_MF_INT(vertices[2].x - vertices[0].x), (vertices[2].y - vertices[0].y));

298

299

bound_coord_ul = MakePolyXFP(vertices[0].x); // + ((1 << COORD_FBS) - 1);

300

bound_coord_ll = MakePolyXFP(vertices[1].x); // + ((1 << COORD_FBS) - 1);

301

302

303

304

305

306

307

if(vertices[1].y == vertices[0].y)

308

{

309

bound_coord_us = 0;

310

right_facing = (bool)(vertices[1].x > vertices[0].x);

311

}

312

else

313

{

314

bound_coord_us = MakePolyXFPStep((vertices[1].x - vertices[0].x), (vertices[1].y - vertices[0].y));

315

right_facing = (bool)(bound_coord_us > base_step);

316

}

317

318

if(vertices[2].y == vertices[1].y)

319

bound_coord_ls = 0;

320

else

321

bound_coord_ls = MakePolyXFPStep((vertices[2].x - vertices[1].x), (vertices[2].y - vertices[1].y));

322

323

if(y_start < ClipY0)

324

{

325

int32 count = ClipY0 - y_start;

326

327

y_start = ClipY0;

328

base_coord += base_step * count;

329

bound_coord_ul += bound_coord_us * count;

330

331

AddIDeltas_DY<goraud, textured>(ig, idl, count);

332

333

if(y_middle < ClipY0)

334

{

335

int32 count_ls = ClipY0 - y_middle;

336

337

y_middle = ClipY0;

338

bound_coord_ll += bound_coord_ls * count_ls;

339

}

340

}

341

342

if(y_bound > (ClipY1 + 1))

343

{

344

y_bound = ClipY1 + 1;

345

346

if(y_middle > y_bound)

347

y_middle = y_bound;

348

}

349

350

if(right_facing)

351

{

352

for(int32 y = y_start; y < y_middle; y++)

353

{

354

DrawSpan<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(y, clut, GetPolyXFP_Int(base_coord), GetPolyXFP_Int(bound_coord_ul), vertices[0].x, ig, idl);

355

base_coord += base_step;

356

bound_coord_ul += bound_coord_us;

357

AddIDeltas_DY<goraud, textured>(ig, idl);

358

}

359

360

for(int32 y = y_middle; y < y_bound; y++)

361

{

362

DrawSpan<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(y, clut, GetPolyXFP_Int(base_coord), GetPolyXFP_Int(bound_coord_ll), vertices[0].x, ig, idl);

363

base_coord += base_step;

364

bound_coord_ll += bound_coord_ls;

365

AddIDeltas_DY<goraud, textured>(ig, idl);

366

}

367

}

368

else

369

{

370

for(int32 y = y_start; y < y_middle; y++)

371

{

372

DrawSpan<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(y, clut, GetPolyXFP_Int(bound_coord_ul), GetPolyXFP_Int(base_coord), vertices[0].x, ig, idl);

373

base_coord += base_step;

374

bound_coord_ul += bound_coord_us;

375

AddIDeltas_DY<goraud, textured>(ig, idl);

376

}

377

378

for(int32 y = y_middle; y < y_bound; y++)

379

{

380

DrawSpan<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(y, clut, GetPolyXFP_Int(bound_coord_ll), GetPolyXFP_Int(base_coord), vertices[0].x, ig, idl);

381

base_coord += base_step;

382

bound_coord_ll += bound_coord_ls;

383

AddIDeltas_DY<goraud, textured>(ig, idl);

384

}

385

}

386

387

#if 0

388

printf("[GPU] Vertices: %d:%d(r=%d, g=%d, b=%d) -> %d:%d(r=%d, g=%d, b=%d) -> %d:%d(r=%d, g=%d, b=%d)\n\n\n", vertices[0].x, vertices[0].y,

389

vertices[0].r, vertices[0].g, vertices[0].b,

390

vertices[1].x, vertices[1].y,

391

vertices[1].r, vertices[1].g, vertices[1].b,

392

vertices[2].x, vertices[2].y,

393

vertices[2].r, vertices[2].g, vertices[2].b);

394

#endif

395

}

396

397

398

template<int numvertices, bool goraud, bool textured, int BlendMode, bool TexMult, uint32 TexMode_TA, bool MaskEval_TA>

399

void PS_GPU::Command_DrawPolygon(const uint32 *cb)

400

{

401

tri_vertex vertices[4];

402

uint32 raw_colors[4];

403

uint32 clut = 0;

404

//uint32 tpage = 0;

405

406

if(numvertices == 4)

407

DrawTimeAvail -= 64; // FIXME, correct time.

408

else

409

DrawTimeAvail -= 32; // FIXME, correct time.

410

411

memset(vertices, 0, sizeof(vertices));

412

413

raw_colors[0] = (*cb & 0xFFFFFF);

414

cb++;

415

416

vertices[0].x = (int16)(*cb & 0xFFFF);

417

vertices[0].y = (int16)(*cb >> 16);

418

cb++;

419

420

421

if(textured)

422

{

423

vertices[0].u = (*cb & 0xFF);

424

vertices[0].v = (*cb >> 8) & 0xFF;

425

clut = ((*cb >> 16) & 0xFFFF) << 4;

426

cb++;

427

}

428

429

if(goraud)

430

{

431

raw_colors[1] = (*cb & 0xFFFFFF);

432

cb++;

433

}

434

435

vertices[1].x = (int16)(*cb & 0xFFFF);

436

vertices[1].y = (int16)(*cb >> 16);

437

cb++;

438

439

if(textured)

440

{

441

vertices[1].u = (*cb & 0xFF);

442

vertices[1].v = (*cb >> 8) & 0xFF;

443

cb++;

444

}

445

446

if(goraud)

447

{

448

raw_colors[2] = (*cb & 0xFFFFFF);

449

cb++;

450

}

451

452

vertices[2].x = (int16)(*cb & 0xFFFF);

453

vertices[2].y = (int16)(*cb >> 16);

454

cb++;

455

456

if(textured)

457

{

458

vertices[2].u = (*cb & 0xFF);

459

vertices[2].v = (*cb >> 8) & 0xFF;

460

cb++;

461

}

462

463

if(numvertices == 4)

464

{

465

if(goraud)

466

{

467

raw_colors[3] = (*cb & 0xFFFFFF);

468

cb++;

469

}

470

471

vertices[3].x = (int16)(*cb & 0xFFFF);

472

vertices[3].y = (int16)(*cb >> 16);

473

cb++;

474

475

if(textured)

476

{

477

vertices[3].u = (*cb & 0xFF);

478

vertices[3].v = (*cb >> 8) & 0xFF;

479

cb++;

480

}

481

}

482

else

483

{

484

raw_colors[3] = raw_colors[0];

485

}

486

487

if(!goraud)

488

raw_colors[1] = raw_colors[2] = raw_colors[3] = raw_colors[0];

489

490

for(int i = 0; i < numvertices; i++)

491

{

492

//raw_colors[i] = rand() & 0xFFFFFF;

493

494

vertices[i].r = raw_colors[i] & 0xFF;

495

vertices[i].g = (raw_colors[i] >> 8) & 0xFF;

496

vertices[i].b = (raw_colors[i] >> 16) & 0xFF;

497

}

498

499

for(int i = 0; i < numvertices; i++)

500

{

501

vertices[i].x += OffsX;

502

vertices[i].y += OffsY;

503

504

// TODO: Test number of bits on real system.

505

vertices[i].x = sign_x_to_s32(12, vertices[i].x);

506

vertices[i].y = sign_x_to_s32(12, vertices[i].y);

507

}

508

509

#if 0

510

printf("Draw polygon %d: ", numvertices);

511

512

for(int i = 0; i < numvertices; i++)

513

{

514

printf("%d:%d ", vertices[i].x, vertices[i].y);

515

//GPURAM[vertices[i].y & 511][vertices[i].x & 1023] = rand();

516

}

517

518

printf("\n");

519

520

#endif

521

522

if(textured && !dtd && (raw_colors[0] == raw_colors[1]) && (raw_colors[1] == raw_colors[2]) && (raw_colors[2] == raw_colors[3]) && (raw_colors[0] == 0x808080))

523

{

524

if(numvertices == 3)

525

DrawTriangle<false, textured, BlendMode, false, TexMode_TA, MaskEval_TA>(vertices, clut);

526

else

527

{

528

tri_vertex vertices_tmp[3];

529

530

memcpy(&vertices_tmp[0], &vertices[1], 3 * sizeof(tri_vertex));

531

532

DrawTriangle<false, textured, BlendMode, false, TexMode_TA, MaskEval_TA>(vertices, clut);

533

DrawTriangle<false, textured, BlendMode, false, TexMode_TA, MaskEval_TA>(vertices_tmp, clut);

534

}

535

return;

536

}

537

538

if(numvertices == 3)

539

DrawTriangle<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(vertices, clut);

540

else

541

{

542

tri_vertex vertices_tmp[3];

543

544

memcpy(&vertices_tmp[0], &vertices[1], 3 * sizeof(tri_vertex));

545

546

DrawTriangle<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(vertices, clut);

547

DrawTriangle<goraud, textured, BlendMode, TexMult, TexMode_TA, MaskEval_TA>(vertices_tmp, clut);

548

}

549

}

550

Older »