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
2fc2f752
Kaydet (Commit)
2fc2f752
authored
Ock 12, 2016
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Bin unused field
Change-Id: I664e3815bcdaff82a03309ae387154914471a80b
üst
bfd69070
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
openglgdiimpl.hxx
vcl/inc/openglgdiimpl.hxx
+0
-1
gdiimpl.cxx
vcl/opengl/gdiimpl.cxx
+2
-3
No files found.
vcl/inc/openglgdiimpl.hxx
Dosyayı görüntüle @
2fc2f752
...
@@ -69,7 +69,6 @@ protected:
...
@@ -69,7 +69,6 @@ protected:
SalGraphics
&
mrParent
;
SalGraphics
&
mrParent
;
/// Pointer to the SalFrame or SalVirtualDevice
/// Pointer to the SalFrame or SalVirtualDevice
SalGeometryProvider
*
mpProvider
;
SalGeometryProvider
*
mpProvider
;
OpenGLFramebuffer
*
mpFramebuffer
;
OpenGLProgram
*
mpProgram
;
OpenGLProgram
*
mpProgram
;
/// This idle handler is used to swap buffers after rendering.
/// This idle handler is used to swap buffers after rendering.
...
...
vcl/opengl/gdiimpl.cxx
Dosyayı görüntüle @
2fc2f752
...
@@ -65,7 +65,6 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryPr
...
@@ -65,7 +65,6 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryPr
:
mpContext
(
nullptr
)
:
mpContext
(
nullptr
)
,
mrParent
(
rParent
)
,
mrParent
(
rParent
)
,
mpProvider
(
pProvider
)
,
mpProvider
(
pProvider
)
,
mpFramebuffer
(
nullptr
)
,
mpProgram
(
nullptr
)
,
mpProgram
(
nullptr
)
,
mpFlush
(
new
OpenGLFlushIdle
(
this
))
,
mpFlush
(
new
OpenGLFlushIdle
(
this
))
,
mbUseScissor
(
false
)
,
mbUseScissor
(
false
)
...
@@ -470,13 +469,13 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
...
@@ -470,13 +469,13 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
// TODO: lfrb: User GL_ARB_copy_image?
// TODO: lfrb: User GL_ARB_copy_image?
OpenGLTexture
aNewTex
=
OpenGLTexture
(
GetWidth
(),
GetHeight
()
);
OpenGLTexture
aNewTex
=
OpenGLTexture
(
GetWidth
(),
GetHeight
()
);
mp
Framebuffer
=
mp
Context
->
AcquireFramebuffer
(
aNewTex
);
mpContext
->
AcquireFramebuffer
(
aNewTex
);
DrawTexture
(
maOffscreenTex
,
aPosAry
);
DrawTexture
(
maOffscreenTex
,
aPosAry
);
maOffscreenTex
=
aNewTex
;
maOffscreenTex
=
aNewTex
;
}
}
else
else
{
{
mp
Framebuffer
=
mp
Context
->
AcquireFramebuffer
(
maOffscreenTex
);
mpContext
->
AcquireFramebuffer
(
maOffscreenTex
);
CHECK_GL_ERROR
();
CHECK_GL_ERROR
();
if
(
bClearTexture
)
if
(
bClearTexture
)
...
...
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