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
930b3017
Kaydet (Commit)
930b3017
authored
Eki 31, 2014
tarafından
Louis-Francis Ratté-Boulianne
Kaydeden (comit)
Markus Mohrhard
Kas 10, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
vcl: Some fixes to the OpenGL impl
Change-Id: I58466142e0a47beb892e10113c1bc34d5ac3abcd
üst
8bb1fb8c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
openglgdiimpl.hxx
vcl/inc/openglgdiimpl.hxx
+1
-1
gdiimpl.cxx
vcl/opengl/gdiimpl.cxx
+4
-7
No files found.
vcl/inc/openglgdiimpl.hxx
Dosyayı görüntüle @
930b3017
...
...
@@ -65,7 +65,7 @@ private:
void
DrawLine
(
long
nX1
,
long
nY1
,
long
nX2
,
long
nY2
);
void
DrawLines
(
sal_uInt32
nPoints
,
const
SalPoint
*
pPtAry
,
bool
bClose
);
void
DrawConvexPolygon
(
sal_uInt32
nPoints
,
const
SalPoint
*
pPtAry
);
void
DrawRect
(
long
nX
,
long
nY
,
long
nWidth
,
nHeight
);
void
DrawRect
(
long
nX
,
long
nY
,
long
nWidth
,
long
nHeight
);
void
DrawPolygon
(
sal_uInt32
nPoints
,
const
SalPoint
*
pPtAry
);
void
DrawPolyPolygon
(
const
basegfx
::
B2DPolyPolygon
&
pPolyPolygon
);
void
DrawTextureRect
(
const
SalTwoRect
&
pPosAry
);
...
...
vcl/opengl/gdiimpl.cxx
Dosyayı görüntüle @
930b3017
...
...
@@ -86,7 +86,6 @@ void OpenGLSalGraphicsImpl::ResetClipRegion()
}
// set the line color to transparent (= don't draw lines)
void
OpenGLSalGraphicsImpl
::
SetLineColor
()
{
if
(
mnLineColor
!=
SALCOLOR_NONE
)
...
...
@@ -151,9 +150,7 @@ bool OpenGLSalGraphicsImpl::CreateSolidProgram( void )
bool
OpenGLSalGraphicsImpl
::
CreateTextureProgram
(
void
)
{
static
const
char
aFragShaderSrc
[]
=
mnTextureProgram
=
OpenGLHelper
::
(
"textureVertexShader"
,
"textureFragmentShader"
);
mnTextureProgram
=
OpenGLHelper
::
LoadShaders
(
"textureVertexShader"
,
"textureFragmentShader"
);
if
(
mnTextureProgram
==
0
)
return
false
;
...
...
@@ -358,7 +355,7 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& pPol
}
glEnableVertexAttribArray
(
GL_ATTRIB_POS
);
glVertexAttribPointer
(
GL_ATTRIB_POS
,
pVertices
.
size
(),
GL_UNSIGNED_SHORT
,
GL_FALSE
,
0
,
pVertices
.
size
()
);
glVertexAttribPointer
(
GL_ATTRIB_POS
,
pVertices
.
size
(),
GL_UNSIGNED_SHORT
,
GL_FALSE
,
0
,
pVertices
.
data
()
);
glDrawArrays
(
GL_TRIANGLES
,
0
,
pVertices
.
size
()
/
2
);
glDisableVertexAttribArray
(
GL_ATTRIB_POS
);
}
...
...
@@ -611,7 +608,7 @@ void OpenGLSalGraphicsImpl::copyArea(
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
void
OpenGLSalGraphicsImpl
::
copyBits
(
const
SalTwoRect
&
rPosAry
,
SalGraphics
*
pSrcGraphics
)
void
OpenGLSalGraphicsImpl
::
copyBits
(
const
SalTwoRect
&
rPosAry
,
SalGraphics
*
/*pSrcGraphics*/
)
{
// TODO Check if SalGraphicsImpl is the same
const
bool
bSameGraphics
(
false
);
...
...
@@ -720,7 +717,7 @@ void OpenGLSalGraphicsImpl::invert(
else
// just invert
{
BeginInvert
();
Draw
Polygon
(
4
,
aPoints
);
Draw
Rect
(
nX
,
nY
,
nWidth
,
nHeight
);
EndInvert
();
}
}
...
...
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