ShuriZma
/
redream
mirror of https://github.com/inolen/redream.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 'Other' color blend types

This commit is contained in:
Anthony Pesch 2016-03-26 23:18:21 -07:00
parent ecc142c810
commit c1af026db6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/emu/tracer.cc
View File

@ -413,7 +413,8 @@ void Tracer::RenderContextMenu() {
for (auto it : rctx_.param_map) { for (auto it : rctx_.param_map) {
int offset = it.first; int offset = it.first;
PCW pcw = re::load<PCW>(tctx_.data + offset); const uint8_t *ptr = tctx_.data + offset;
PCW pcw = re::load<PCW>(ptr);
bool param_selected = offset == current_offset_; bool param_selected = offset == current_offset_;
if (!hide_params_[pcw.para_type]) { if (!hide_params_[pcw.para_type]) {
@ -437,7 +438,7 @@ void Tracer::RenderContextMenu() {
case TA_PARAM_POLY_OR_VOL: { case TA_PARAM_POLY_OR_VOL: {
const PolyParam *param = const PolyParam *param =
reinterpret_cast<const PolyParam *>(tctx_.data); reinterpret_cast<const PolyParam *>(ptr);
vertex_type = TileAccelerator::GetVertexType(param->type0.pcw); vertex_type = TileAccelerator::GetVertexType(param->type0.pcw);
@ -452,7 +453,7 @@ void Tracer::RenderContextMenu() {
case TA_PARAM_SPRITE: { case TA_PARAM_SPRITE: {
const PolyParam *param = const PolyParam *param =
reinterpret_cast<const PolyParam *>(tctx_.data); reinterpret_cast<const PolyParam *>(ptr);
vertex_type = TileAccelerator::GetVertexType(param->type0.pcw); vertex_type = TileAccelerator::GetVertexType(param->type0.pcw);
@ -467,7 +468,7 @@ void Tracer::RenderContextMenu() {
case TA_PARAM_VERTEX: { case TA_PARAM_VERTEX: {
const VertexParam *param = const VertexParam *param =
reinterpret_cast<const VertexParam *>(tctx_.data); reinterpret_cast<const VertexParam *>(ptr);
snprintf(label, sizeof(label), "0x%04x TA_PARAM_VERTEX", offset); snprintf(label, sizeof(label), "0x%04x TA_PARAM_VERTEX", offset);
ImGui::Selectable(label, &param_selected); ImGui::Selectable(label, &param_selected);

4
src/hw/holly/tile_renderer.cc
View File

@ -66,7 +66,7 @@ inline CullFace TranslateCull(uint32_t cull_mode) {
inline BlendFunc TranslateSrcBlendFunc(uint32_t blend_func) { inline BlendFunc TranslateSrcBlendFunc(uint32_t blend_func) {
static BlendFunc src_blend_funcs[] = { static BlendFunc src_blend_funcs[] = {
BLEND_ZERO, BLEND_ONE, BLEND_ZERO, BLEND_ONE,
BLEND_SRC_COLOR, BLEND_ONE_MINUS_SRC_COLOR, BLEND_DST_COLOR, BLEND_ONE_MINUS_DST_COLOR,
BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA,
BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA}; BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA};
return src_blend_funcs[blend_func]; return src_blend_funcs[blend_func];
@ -75,7 +75,7 @@ inline BlendFunc TranslateSrcBlendFunc(uint32_t blend_func) {
inline BlendFunc TranslateDstBlendFunc(uint32_t blend_func) { inline BlendFunc TranslateDstBlendFunc(uint32_t blend_func) {
static BlendFunc dst_blend_funcs[] = { static BlendFunc dst_blend_funcs[] = {
BLEND_ZERO, BLEND_ONE, BLEND_ZERO, BLEND_ONE,
BLEND_DST_COLOR, BLEND_ONE_MINUS_DST_COLOR, BLEND_SRC_COLOR, BLEND_ONE_MINUS_SRC_COLOR,
BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA, BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA,
BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA}; BLEND_DST_ALPHA, BLEND_ONE_MINUS_DST_ALPHA};
return dst_blend_funcs[blend_func]; return dst_blend_funcs[blend_func];