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
2c91daa5
Kaydet (Commit)
2c91daa5
authored
Eki 12, 2015
tarafından
Tomaž Vajngerl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
opengl: improve VCL_GL_INFO reporting in OpenGLSalBitmap
Change-Id: I00d695e11f4df140482bba7d8909216515e330be
üst
9c48fae0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
salbmp.cxx
vcl/opengl/salbmp.cxx
+14
-6
No files found.
vcl/opengl/salbmp.cxx
Dosyayı görüntüle @
2c91daa5
...
...
@@ -71,7 +71,8 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, long nX, long nY, long
OpenGLZone
aZone
;
Destroy
();
VCL_GL_INFO
(
"vcl.opengl"
,
"OpenGLSalBitmap::Create from FBO: ["
<<
nX
<<
", "
<<
nY
<<
"] "
<<
nWidth
<<
"x"
<<
nHeight
);
VCL_GL_INFO
(
"vcl.opengl"
,
"OpenGLSalBitmap::Create from FBO: ["
<<
nX
<<
", "
<<
nY
<<
"] "
<<
nWidth
<<
"x"
<<
nHeight
);
mnWidth
=
nWidth
;
mnHeight
=
nHeight
;
...
...
@@ -127,7 +128,9 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount
const
OpenGLSalBitmap
&
rSourceBitmap
=
static_cast
<
const
OpenGLSalBitmap
&>
(
rSalBmp
);
VCL_GL_INFO
(
"vcl.opengl"
,
"OpenGLSalBitmap::Create from BMP: "
<<
rSourceBitmap
.
mnWidth
<<
"x"
<<
rSourceBitmap
.
mnHeight
);
VCL_GL_INFO
(
"vcl.opengl"
,
"OpenGLSalBitmap::Create from BMP: "
<<
rSourceBitmap
.
mnWidth
<<
"x"
<<
rSourceBitmap
.
mnHeight
<<
" Bits old: "
<<
mnBits
<<
" new:"
<<
nNewBitCount
);
if
(
isValidBitCount
(
nNewBitCount
)
)
{
...
...
@@ -177,7 +180,7 @@ void OpenGLSalBitmap::Destroy()
{
OpenGLZone
aZone
;
VCL_GL_INFO
(
"vcl.opengl"
,
"Destroy OpenGLSalBitmap"
);
VCL_GL_INFO
(
"vcl.opengl"
,
"Destroy OpenGLSalBitmap texture:"
<<
maTexture
.
Id
()
);
maPendingOps
.
clear
();
maTexture
=
OpenGLTexture
();
maUserBuffer
.
reset
();
...
...
@@ -384,7 +387,7 @@ void OpenGLSalBitmap::ExecuteOperations()
GLuint
OpenGLSalBitmap
::
CreateTexture
()
{
VCL_GL_INFO
(
"vcl.opengl"
,
"::CreateTexture
"
);
VCL_GL_INFO
(
"vcl.opengl"
,
"::CreateTexture
bits: "
<<
mnBits
);
GLenum
nFormat
=
GL_RGBA
;
GLenum
nType
=
GL_UNSIGNED_BYTE
;
sal_uInt8
*
pData
(
NULL
);
...
...
@@ -419,6 +422,8 @@ GLuint OpenGLSalBitmap::CreateTexture()
}
else
{
VCL_GL_INFO
(
"vcl.opengl"
,
"::CreateTexture - convert from "
<<
mnBits
<<
" to 24 bits"
);
// convert to 32 bits RGBA using palette
pData
=
new
sal_uInt8
[
mnBufHeight
*
mnBufWidth
*
4
];
bAllocated
=
true
;
...
...
@@ -455,7 +460,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
lclInstantiateTexture
(
maTexture
,
mnBufWidth
,
mnBufHeight
,
nFormat
,
nType
,
pData
);
VCL_GL_INFO
(
"vcl.opengl"
,
"Created texture "
<<
maTexture
.
Id
()
);
VCL_GL_INFO
(
"vcl.opengl"
,
"Created texture "
<<
maTexture
.
Id
()
<<
" bits: "
<<
mnBits
);
if
(
bAllocated
)
delete
[]
pData
;
...
...
@@ -471,7 +476,7 @@ bool OpenGLSalBitmap::ReadTexture()
{
sal_uInt8
*
pData
=
maUserBuffer
.
get
();
VCL_GL_INFO
(
"vcl.opengl"
,
"::ReadTexture "
<<
mnWidth
<<
"x"
<<
mnHeight
);
VCL_GL_INFO
(
"vcl.opengl"
,
"::ReadTexture "
<<
mnWidth
<<
"x"
<<
mnHeight
<<
" bits: "
<<
mnBits
);
if
(
pData
==
NULL
)
return
false
;
...
...
@@ -816,6 +821,9 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ )
bool
OpenGLSalBitmap
::
Replace
(
const
Color
&
rSearchColor
,
const
Color
&
rReplaceColor
,
sal_uLong
nTol
)
{
VCL_GL_INFO
(
"vcl.opengl"
,
"::Replace"
);
OpenGLZone
aZone
;
OpenGLFramebuffer
*
pFramebuffer
;
...
...
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