Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected GLRenderer's instantiation function name.

Browse Source 
(I guess frenchies are guilty here, as mmu_man's ThemeAddOn have the same disease...)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23757 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2008-01-26 22:51:51 +00:00
parent 62c35bb99a
commit 46b5cc220a
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/os/opengl/GLRenderer.h
View File

@ -63,7 +63,7 @@ private:
renderer_id fID;
};
extern "C" _EXPORT BGLRenderer * instanciate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher);
extern "C" _EXPORT BGLRenderer * instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher);
#endif // GLRENDERER_H

4
src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
View File

@ -132,10 +132,8 @@ extern const char * color_space_name(color_space space);
#include "swrast/s_spantemp.h"
// TODO: Rename this to "instantiate_gl_renderer" to
// be consistent with BArchivable api ?
extern "C" _EXPORT BGLRenderer *
instanciate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher)
instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher)
{
return new MesaSoftwareRenderer(view, options, dispatcher);
}

8
src/kits/opengl/GLRendererRoster.cpp
View File

@ -132,12 +132,12 @@ GLRendererRoster::CreateRenderer(const entry_ref& ref)
if (image < B_OK)
return image;
BGLRenderer *(*instanc)(BGLView *view, ulong options, BGLDispatcher *dispatcher);
BGLRenderer *(*instantiate_renderer)(BGLView *view, ulong options, BGLDispatcher *dispatcher);
status = get_image_symbol(image, "instanciate_gl_renderer",
B_SYMBOL_TYPE_TEXT, (void**)&instanc);
status = get_image_symbol(image, "instantiate_gl_renderer",
B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer);
if (status == B_OK) {
BGLRenderer *renderer = instanc(fView, fOptions, new BGLDispatcher());
BGLRenderer *renderer = instantiate_renderer(fView, fOptions, new BGLDispatcher());
if (!renderer) {
unload_add_on(image);
return B_UNSUPPORTED;