diff options
author | 2014-02-26 18:58:07 +0000 | |
---|---|---|
committer | 2014-02-26 18:58:07 +0000 | |
commit | 6a06d7604f35881a72957c1c5c34df024796aec0 (patch) | |
tree | 6a328e588bfd052a1d555e972ea87707fb15f042 /src/emu/render.c | |
parent | 38c122f4aa02858cd9acba5a1e6e09587d82ae97 (diff) |
Revert changes committed by accident.
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 bff2c367295..57b31a12a70 100644 --- a/src/emu/render.c +++ b/src/emu/render.c @@ -401,7 +401,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) @@ -1338,10 +1338,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); } @@ -1704,6 +1701,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; |