diff options
author | 2012-05-26 11:15:14 +0000 | |
---|---|---|
committer | 2012-05-26 11:15:14 +0000 | |
commit | 35bed5a154ec4dc23b77d33c926e61832f7edd8c (patch) | |
tree | 13e95bc6d9a04e6c1f3be291844594871798ebe0 /src/emu/render.c | |
parent | 8f37cc10ced5a97245507eace1befd0fba1ab9ea (diff) |
Revert some changes committed by accident. No WN.
Diffstat (limited to 'src/emu/render.c')
-rw-r--r-- | src/emu/render.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emu/render.c b/src/emu/render.c index 78a208cbd01..b72bc2a2d6b 100644 --- a/src/emu/render.c +++ b/src/emu/render.c @@ -434,7 +434,7 @@ void render_texture::release() void render_texture::set_bitmap(bitmap_t &bitmap, const rectangle &sbounds, texture_format format) { - //assert(bitmap.cliprect().contains(sbounds)); + assert(bitmap.cliprect().contains(sbounds)); // ensure we have a valid palette for palettized modes if (format == TEXFORMAT_PALETTE16 || format == TEXFORMAT_PALETTEA16) @@ -1377,10 +1377,7 @@ render_primitive_list &render_target::get_primitives() // if there is no associated element, it must be a screen element if (curitem->screen() != NULL) - { add_container_primitives(list, item_xform, curitem->screen()->container(), blendmode); - curitem->screen()->set_render_size((int) item_xform.xscale, (int) item_xform.yscale); - } else add_element_primitives(list, item_xform, *curitem->element(), curitem->state(), blendmode); } @@ -1743,6 +1740,7 @@ void render_target::add_container_primitives(render_primitive_list &list, const prim->bounds.x1 = render_round_nearest(container_xform.xoffs + bounds.x1 * container_xform.xscale); prim->bounds.y1 = render_round_nearest(container_xform.yoffs + bounds.y1 * container_xform.yscale); } + // compute the color of the primitive prim->color.r = container_xform.color.r * curitem->color().r; prim->color.g = container_xform.color.g * curitem->color().g; |