expedite: remove software_sdl backend and use buffer instead.
This result in an overall drop of 17% in performance. I think it may be due to some stuff related to HWSURFACE, the fact it use double buffer or that maybe SDL_FillRect was faster for cleaning up memory. If someone is really interested by this performance drop, better fix them with buffer engine. SVN revision: 68351
This commit is contained in:
parent
32c11e818c
commit
98b733080e
|
@ -3,12 +3,18 @@
|
||||||
|
|
||||||
#include <SDL/SDL.h>
|
#include <SDL/SDL.h>
|
||||||
#include <Evas_Engine_SDL.h>
|
#include <Evas_Engine_SDL.h>
|
||||||
|
#include <Evas_Engine_Buffer.h>
|
||||||
|
|
||||||
|
static void *
|
||||||
|
_expedite_sdl_switch_buffer(void *data, void *dest __UNUSED__)
|
||||||
|
{
|
||||||
|
SDL_Flip(data);
|
||||||
|
return ((SDL_Surface*)data)->pixels;
|
||||||
|
}
|
||||||
|
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
engine_software_sdl_args(const char *engine, int width, int height)
|
engine_software_sdl_args(const char *engine, int width, int height)
|
||||||
{
|
{
|
||||||
Evas_Engine_Info_SDL *einfo;
|
|
||||||
int i;
|
|
||||||
int ok = 0;
|
int ok = 0;
|
||||||
|
|
||||||
if (!strcmp(engine, "sdl")) ok = 1;
|
if (!strcmp(engine, "sdl")) ok = 1;
|
||||||
|
@ -16,8 +22,52 @@ engine_software_sdl_args(const char *engine, int width, int height)
|
||||||
if (!ok) return EINA_FALSE;
|
if (!ok) return EINA_FALSE;
|
||||||
|
|
||||||
if (ok == 1)
|
if (ok == 1)
|
||||||
evas_output_method_set(evas, evas_render_method_lookup("software_sdl"));
|
{
|
||||||
|
Evas_Engine_Info_Buffer *einfo;
|
||||||
|
|
||||||
|
evas_output_method_set(evas, evas_render_method_lookup("buffer"));
|
||||||
|
|
||||||
|
einfo = (Evas_Engine_Info_Buffer *) evas_engine_info_get(evas);
|
||||||
|
if (einfo)
|
||||||
|
{
|
||||||
|
SDL_Init(SDL_INIT_NOPARACHUTE);
|
||||||
|
|
||||||
|
if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
|
||||||
|
{
|
||||||
|
printf("SDL_Init failed with %s", SDL_GetError());
|
||||||
|
SDL_Quit();
|
||||||
|
return EINA_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_RGB32;
|
||||||
|
einfo->info.switch_data = SDL_SetVideoMode(width, height, 32, SDL_HWSURFACE | SDL_DOUBLEBUF);
|
||||||
|
if (!einfo->info.switch_data)
|
||||||
|
{
|
||||||
|
printf("SDL_SetVideoMode failed !");
|
||||||
|
return EINA_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
SDL_SetAlpha(einfo->info.switch_data, SDL_SRCALPHA, 0);
|
||||||
|
SDL_FillRect(einfo->info.switch_data, NULL, 0);
|
||||||
|
|
||||||
|
einfo->info.dest_buffer = ((SDL_Surface*)einfo->info.switch_data)->pixels;
|
||||||
|
einfo->info.dest_buffer_row_bytes = width * sizeof (int);
|
||||||
|
einfo->info.use_color_key = 0;
|
||||||
|
einfo->info.alpha_threshold = 0;
|
||||||
|
einfo->info.func.new_update_region = NULL;
|
||||||
|
einfo->info.func.free_update_region = NULL;
|
||||||
|
einfo->info.func.switch_buffer = _expedite_sdl_switch_buffer;
|
||||||
|
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
|
||||||
|
{
|
||||||
|
printf("evas_engine_info_set() for engine 'sdl' with 'buffer' backend failed.");
|
||||||
|
return EINA_FALSE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
Evas_Engine_Info_SDL *einfo;
|
||||||
|
|
||||||
evas_output_method_set(evas, evas_render_method_lookup("software_16_sdl"));
|
evas_output_method_set(evas, evas_render_method_lookup("software_16_sdl"));
|
||||||
|
|
||||||
einfo = (Evas_Engine_Info_SDL *) evas_engine_info_get(evas);
|
einfo = (Evas_Engine_Info_SDL *) evas_engine_info_get(evas);
|
||||||
|
@ -31,6 +81,7 @@ engine_software_sdl_args(const char *engine, int width, int height)
|
||||||
printf("Evas can not setup the informations of the Software SDL Engine\n");
|
printf("Evas can not setup the informations of the Software SDL Engine\n");
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -39,6 +90,7 @@ void
|
||||||
engine_software_sdl_loop(void)
|
engine_software_sdl_loop(void)
|
||||||
{
|
{
|
||||||
SDL_Event event;
|
SDL_Event event;
|
||||||
|
int rmethod;
|
||||||
|
|
||||||
while(SDL_PollEvent(&event))
|
while(SDL_PollEvent(&event))
|
||||||
{
|
{
|
||||||
|
@ -56,9 +108,41 @@ engine_software_sdl_loop(void)
|
||||||
evas_event_feed_mouse_up(evas, event.button.button, EVAS_BUTTON_NONE, 0, NULL);
|
evas_event_feed_mouse_up(evas, event.button.button, EVAS_BUTTON_NONE, 0, NULL);
|
||||||
break;
|
break;
|
||||||
case SDL_VIDEORESIZE:
|
case SDL_VIDEORESIZE:
|
||||||
|
rmethod = evas_output_method_get(evas);
|
||||||
|
if (rmethod == evas_render_method_lookup("buffer"))
|
||||||
|
{
|
||||||
|
Evas_Engine_Info_Buffer *einfo;
|
||||||
|
|
||||||
|
einfo = (Evas_Engine_Info_Buffer *) evas_engine_info_get(evas);
|
||||||
|
if (einfo)
|
||||||
|
{
|
||||||
|
einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_RGB32;
|
||||||
|
einfo->info.switch_data = SDL_SetVideoMode(event.resize.w, event.resize.h, 32, SDL_HWSURFACE | SDL_DOUBLEBUF);
|
||||||
|
if (!einfo->info.switch_data)
|
||||||
|
{
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
|
SDL_SetAlpha(einfo->info.switch_data, SDL_SRCALPHA, 0);
|
||||||
|
SDL_FillRect(einfo->info.switch_data, NULL, 0);
|
||||||
|
|
||||||
|
einfo->info.dest_buffer = ((SDL_Surface*)einfo->info.switch_data)->pixels;
|
||||||
|
einfo->info.dest_buffer_row_bytes = event.resize.w * sizeof (int);
|
||||||
|
einfo->info.use_color_key = 0;
|
||||||
|
einfo->info.alpha_threshold = 0;
|
||||||
|
einfo->info.func.new_update_region = NULL;
|
||||||
|
einfo->info.func.free_update_region = NULL;
|
||||||
|
einfo->info.func.switch_buffer = _expedite_sdl_switch_buffer;
|
||||||
|
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
|
||||||
|
{
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
evas_output_viewport_set(evas, 0, 0,
|
evas_output_viewport_set(evas, 0, 0,
|
||||||
event.resize.w, event.resize.w);
|
event.resize.h, event.resize.w);
|
||||||
evas_output_size_set(evas, event.resize.w, event.resize.w);
|
evas_output_size_set(evas, event.resize.h, event.resize.w);
|
||||||
evas_output_size_get(evas, &win_w, &win_h);
|
evas_output_size_get(evas, &win_w, &win_h);
|
||||||
break;
|
break;
|
||||||
case SDL_VIDEOEXPOSE:
|
case SDL_VIDEOEXPOSE:
|
||||||
|
|
Loading…
Reference in New Issue