Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
40688389
Kaydet (Commit)
40688389
authored
Kas 26, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
vcl: prefix global variable g_vShareList
Change-Id: I13ecc76d8bd75ee65e626670995d7c93efc953ca
üst
bfaf8774
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
OpenGLContext.cxx
vcl/source/opengl/OpenGLContext.cxx
+10
-10
No files found.
vcl/source/opengl/OpenGLContext.cxx
Dosyayı görüntüle @
40688389
...
...
@@ -33,9 +33,9 @@ using namespace com::sun::star;
// TODO use rtl::Static instead of 'static'
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
static
std
::
vector
<
GLXContext
>
vShareList
;
static
std
::
vector
<
GLXContext
>
g_
vShareList
;
#elif defined(WNT)
static
std
::
vector
<
HGLRC
>
vShareList
;
static
std
::
vector
<
HGLRC
>
g_
vShareList
;
#endif
GLWindow
::~
GLWindow
()
...
...
@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
if
(
m_aGLWin
.
hRC
)
{
vShareList
.
erase
(
std
::
remove
(
vShareList
.
begin
(),
vShareList
.
end
(),
m_aGLWin
.
hRC
),
vShareList
.
end
());
g_vShareList
.
erase
(
std
::
remove
(
g_vShareList
.
begin
(),
g_vShareList
.
end
(),
m_aGLWin
.
hRC
),
g_
vShareList
.
end
());
wglMakeCurrent
(
m_aGLWin
.
hDC
,
0
);
wglDeleteContext
(
m_aGLWin
.
hRC
);
...
...
@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
if
(
m_aGLWin
.
ctx
)
{
vShareList
.
erase
(
std
::
remove
(
vShareList
.
begin
(),
vShareList
.
end
(),
m_aGLWin
.
ctx
),
vShareList
.
end
());
g_vShareList
.
erase
(
std
::
remove
(
g_vShareList
.
begin
(),
g_vShareList
.
end
(),
m_aGLWin
.
ctx
),
g_
vShareList
.
end
());
glXMakeCurrent
(
m_aGLWin
.
dpy
,
None
,
NULL
);
if
(
glGetError
()
!=
GL_NO_ERROR
)
...
...
@@ -696,8 +696,8 @@ bool OpenGLContext::ImplInit()
SAL_INFO
(
"vcl.opengl"
,
"OpenGLContext::ImplInit----start"
);
if
(
!
vShareList
.
empty
()
)
pSharedCtx
=
vShareList
.
front
();
if
(
!
g_vShareList
.
empty
()
)
pSharedCtx
=
g_
vShareList
.
front
();
#ifdef DBG_UTIL
if
(
!
mbPixmap
&&
glXCreateContextAttribsARB
&&
!
mbRequestLegacyContext
)
...
...
@@ -737,7 +737,7 @@ bool OpenGLContext::ImplInit()
if
(
m_aGLWin
.
ctx
)
{
vShareList
.
push_back
(
m_aGLWin
.
ctx
);
g_
vShareList
.
push_back
(
m_aGLWin
.
ctx
);
}
else
{
...
...
@@ -903,8 +903,8 @@ bool OpenGLContext::ImplInit()
return
false
;
HGLRC
hSharedCtx
=
0
;
if
(
!
vShareList
.
empty
())
hSharedCtx
=
vShareList
.
front
();
if
(
!
g_
vShareList
.
empty
())
hSharedCtx
=
g_
vShareList
.
front
();
// now setup the shared context; this needs a temporary context already
// set up in order to work
...
...
@@ -926,7 +926,7 @@ bool OpenGLContext::ImplInit()
return
false
;
}
vShareList
.
push_back
(
m_aGLWin
.
hRC
);
g_
vShareList
.
push_back
(
m_aGLWin
.
hRC
);
RECT
clientRect
;
GetClientRect
(
WindowFromDC
(
m_aGLWin
.
hDC
),
&
clientRect
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment