diff options
| author | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
| commit | 8339345b4e7e0b2f6520af9ecf512c7a8e538276 (patch) | |
| tree | 0f165c27fcd9ce0b3a367c2284ce2a992e6c2d2b /lib/wx/c_src/wxe_impl.cpp | |
| parent | 99a28d961d2d760e98353b55991f1fc51dee06b0 (diff) | |
| parent | abc92a6f3b4615e596992eda153da0c09a3c7cbf (diff) | |
| download | otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.gz otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.bz2 otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.zip | |
Merge branch 'dgud/wx/separate-opengl' into dev
* dgud/wx/separate-opengl:
Fix non available opengl functions
Add lib paths for *bsd variants
Initilize opengl after setCurrent
Update to OpenGL 4.1
Remove ostype sub dirs below wx/priv
Windows and Mac build issues
Add dialyser spec
Better make dependecies for api generation
Split opengl functionality into separate dynamic library
Diffstat (limited to 'lib/wx/c_src/wxe_impl.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index 6d2926ce4e..79d1a29519 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -68,7 +68,6 @@ ErlDrvTermData wxe_batch_caller = 0; ErlDrvTermData init_caller = 0; // extern opengl -extern int gl_initiated; void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]); @@ -265,7 +264,6 @@ bool WxeApp::OnInit() init_nonconsts(global_me, init_caller); erl_drv_mutex_lock(wxe_status_m); wxe_status = WXE_INITIATED; - gl_initiated = FALSE; erl_drv_cond_signal(wxe_status_c); erl_drv_mutex_unlock(wxe_status_m); return TRUE; |