CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 11:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup filters.

Browse Source
This commit is contained in:
Themaister 2014-04-15 19:36:23 +02:00
parent d0a6f45565
commit ff424e239d
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/filters/darken.c
View File

@ -15,6 +15,8 @@
// Compile: gcc -o darken.so -shared darken.c -std=c99 -O3 -Wall -pedantic -fPIC
// Useless filter, just nice as a reference for other filters.
#include "softfilter.h"
#include <stdlib.h>
@ -30,8 +32,8 @@ static unsigned darken_output_fmts(unsigned input_fmts)
struct thread_data
{
uint32_t *out_data;
const uint32_t *in_data;
void *out_data;
const void *in_data;
size_t out_pitch;
size_t in_pitch;
unsigned width;
@ -48,7 +50,7 @@ struct filter_data
static unsigned darken_threads(void *data)
{
struct filter_data *filt = (struct filter_data*)data;
return filt->threads;;
return filt->threads;
}
static void *darken_create(unsigned in_fmt, unsigned out_fmt,
@ -93,8 +95,9 @@ static void work_cb_xrgb8888(void *data, void *thread_data)
unsigned width = thr->width;
unsigned height = thr->height;
for (unsigned y = 0; y < height; y++, input += thr->in_pitch >> 2, output += thr->out_pitch >> 2)
for (unsigned x = 0; x < width; x++)
unsigned x, y;
for (y = 0; y < height; y++, input += thr->in_pitch >> 2, output += thr->out_pitch >> 2)
for (x = 0; x < width; x++)
output[x] = (input[x] >> 2) & (0x3f * 0x01010101);
}
@ -106,9 +109,10 @@ static void work_cb_rgb565(void *data, void *thread_data)
unsigned width = thr->width;
unsigned height = thr->height;
for (unsigned y = 0; y < height; y++, input += thr->in_pitch >> 1, output += thr->out_pitch >> 1)
for (unsigned x = 0; x < width; x++)
output[x] = (input[x] >> 1) & (0x1f * 0x00101010);
unsigned x, y;
for (y = 0; y < height; y++, input += thr->in_pitch >> 1, output += thr->out_pitch >> 1)
for (x = 0; x < width; x++)
output[x] = (input[x] >> 2) & ((0x7 << 0) | (0xf << 5) | (0x7 << 11));
}
static void darken_packets(void *data,
@ -116,14 +120,15 @@ static void darken_packets(void *data,
void *output, size_t output_stride,
const void *input, unsigned width, unsigned height, size_t input_stride)
{
unsigned i;
struct filter_data *filt = (struct filter_data*)data;
for (unsigned i = 0; i < filt->threads; i++)
for (i = 0; i < filt->threads; i++)
{
struct thread_data *thr = (struct thread_data*)&filt->workers[i];
unsigned y_start = (height * i) / filt->threads;
unsigned y_end = (height * (i + 1)) / filt->threads;
thr->out_data = (uint32_t*)output + y_start * (output_stride >> 2);
thr->in_data = (const uint32_t*)input + y_start * (input_stride >> 2);
thr->out_data = (uint8_t*)output + y_start * output_stride;
thr->in_data = (const uint8_t*)input + y_start * input_stride;
thr->out_pitch = output_stride;
thr->in_pitch = input_stride;
thr->width = width;

48
gfx/filters/scale2x.c
View File

@ -19,8 +19,9 @@
#include <stdlib.h>
static void scale2x_generic_rgb565(unsigned width, unsigned height,
const uint16_t *__restrict__ src, unsigned src_stride,
uint16_t * __restrict__ dst, unsigned dst_stride)
int first, int last,
const uint16_t *src, unsigned src_stride,
uint16_t *dst, unsigned dst_stride)
{
unsigned x, y;
uint16_t *out0 = (uint16_t*)dst;
@ -28,8 +29,8 @@ static void scale2x_generic_rgb565(unsigned width, unsigned height,
for (y = 0; y < height; ++y)
{
const int prevline = (y == 0 ? 0 : src_stride);
const int nextline = (y == height - 1 ? 0 : src_stride);
const int prevline = ((y == 0) && first) ? 0 : src_stride;
const int nextline = ((y == height - 1) && last) ? 0 : src_stride;
for (x = 0; x < width; ++x)
{
@ -62,8 +63,9 @@ static void scale2x_generic_rgb565(unsigned width, unsigned height,
}
static void scale2x_generic_xrgb8888(unsigned width, unsigned height,
const uint32_t *__restrict__ src, unsigned src_stride,
uint32_t * __restrict__ dst, unsigned dst_stride)
int first, int last,
const uint32_t *src, unsigned src_stride,
uint32_t *dst, unsigned dst_stride)
{
unsigned x, y;
uint32_t *out0 = (uint32_t*)dst;
@ -71,8 +73,8 @@ static void scale2x_generic_xrgb8888(unsigned width, unsigned height,
for (y = 0; y < height; ++y)
{
const int prevline = (y == 0 ? 0 : src_stride);
const int nextline = (y == height - 1 ? 0 : src_stride);
const int prevline = ((y == 0) && first) ? 0 : src_stride;
const int nextline = ((y == height - 1) && last) ? 0 : src_stride;
for (x = 0; x < width; ++x)
{
@ -116,12 +118,14 @@ static unsigned scale2x_generic_output_fmts(unsigned input_fmts)
struct thread_data
{
uint32_t *out_data;
const uint32_t *in_data;
void *out_data;
const void *in_data;
size_t out_pitch;
size_t in_pitch;
unsigned width;
unsigned height;
int first, last;
};
struct filter_data
@ -134,7 +138,7 @@ struct filter_data
static unsigned scale2x_generic_threads(void *data)
{
struct filter_data *filt = (struct filter_data*)data;
return filt->threads;;
return filt->threads;
}
static void *scale2x_generic_create(unsigned in_fmt, unsigned out_fmt,
@ -146,7 +150,7 @@ static void *scale2x_generic_create(unsigned in_fmt, unsigned out_fmt,
struct filter_data *filt = (struct filter_data*)calloc(1, sizeof(*filt));
if (!filt)
return NULL;
filt->workers = calloc(threads, sizeof(struct thread_data));
filt->workers = (struct thread_data*)calloc(threads, sizeof(struct thread_data));
filt->threads = threads;
filt->in_fmt = in_fmt;
if (!filt->workers)
@ -179,7 +183,8 @@ static void work_cb_xrgb8888(void *data, void *thread_data)
unsigned width = thr->width;
unsigned height = thr->height;
scale2x_generic_xrgb8888(width, height, input, thr->in_pitch, output, thr->out_pitch);
scale2x_generic_xrgb8888(width, height,
thr->first, thr->last, input, thr->in_pitch >> 2, output, thr->out_pitch >> 2);
}
static void work_cb_rgb565(void *data, void *thread_data)
@ -190,7 +195,8 @@ static void work_cb_rgb565(void *data, void *thread_data)
unsigned width = thr->width;
unsigned height = thr->height;
scale2x_generic_rgb565(width, height, input, thr->in_pitch, output, thr->out_pitch);
scale2x_generic_rgb565(width, height,
thr->first, thr->last, input, thr->in_pitch >> 1, output, thr->out_pitch >> 1);
}
static void scale2x_generic_packets(void *data,
@ -199,18 +205,24 @@ static void scale2x_generic_packets(void *data,
const void *input, unsigned width, unsigned height, size_t input_stride)
{
struct filter_data *filt = (struct filter_data*)data;
for (unsigned i = 0; i < filt->threads; i++)
unsigned i;
for (i = 0; i < filt->threads; i++)
{
struct thread_data *thr = (struct thread_data*)&filt->workers[i];
struct thread_data *thr = &filt->workers[i];
unsigned y_start = (height * i) / filt->threads;
unsigned y_end = (height * (i + 1)) / filt->threads;
thr->out_data = (uint32_t*)output + y_start * (output_stride >> 2);
thr->in_data = (const uint32_t*)input + y_start * (input_stride >> 2);
thr->out_data = (uint8_t*)output + y_start * 2 * output_stride;
thr->in_data = (const uint8_t*)input + y_start * input_stride;
thr->out_pitch = output_stride;
thr->in_pitch = input_stride;
thr->width = width;
thr->height = y_end - y_start;
// Workers need to know if they can access pixels outside their given buffer.
thr->first = y_start;
thr->last = y_end == height;
if (filt->in_fmt == SOFTFILTER_FMT_XRGB8888)
packets[i].work = work_cb_xrgb8888;
else if (filt->in_fmt == SOFTFILTER_FMT_RGB565)