empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lock palettes to protect color array structure

Browse source
This commit is contained in:
Ilari Liusvaara 2012-03-07 14:44:24 +02:00
parent 1d2d806acc
commit 72a8296eb9
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/lua/bitmap.hpp
View file

@ -5,6 +5,7 @@
#include <string>
#include <cstdint>
#include "core/render.hpp"
#include "core/window.hpp"
struct lua_bitmap
{
@ -25,6 +26,9 @@ struct lua_dbitmap
struct lua_palette
{
std::vector<premultiplied_color> colors;
lua_palette();
~lua_palette();
mutex* palette_mutex;
};
struct lua_loaded_bitmap

20
src/lua/gui-bitmap.cpp
View file

@ -18,6 +18,16 @@ lua_dbitmap::lua_dbitmap(uint32_t w, uint32_t h)
pixels.resize(width * height);
}
lua_palette::lua_palette()
{
palette_mutex = &mutex::aquire();
}
lua_palette::~lua_palette()
{
delete palette_mutex;
}
namespace
{
struct render_object_bitmap : public render_object
@ -50,6 +60,8 @@ namespace
void operator()(struct screen& scr) throw()
{
if(p)
p->object()->palette_mutex->lock();
size_t pallim = 0;
size_t w, h;
premultiplied_color* palette;
@ -86,6 +98,8 @@ namespace
for(int32_t c = xmin; c < xmax; c++, eptr++)
b2->object()->pixels[r * b2->object()->width + c].apply(rptr[eptr]);
}
if(p)
p->object()->palette_mutex->unlock();
}
private:
int32_t x;
@ -147,8 +161,12 @@ namespace
uint16_t c = get_numeric_argument<uint16_t>(LS, 2, fname.c_str());
int64_t nval = get_numeric_argument<int64_t>(LS, 3, fname.c_str());
premultiplied_color nc(nval);
if(p->colors.size() <= c);
//The mutex lock protects only the internals of colors array.
if(p->colors.size() <= c) {
p->palette_mutex->lock();
p->colors.resize(static_cast<uint32_t>(c) + 1);
p->palette_mutex->unlock();
}
p->colors[c] = nc;
return 0;
});