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
f9d2de85
Kaydet (Commit)
f9d2de85
authored
Agu 01, 2014
tarafından
weigao
Kaydeden (comit)
Markus Mohrhard
Agu 06, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
texture should be released in render thread
Change-Id: I4ae03163a2bf9aff831e6fd3a8c1c91fa3eba675
üst
b757ac0b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+1
-0
GL3DRenderer.hxx
chart2/source/view/inc/GL3DRenderer.hxx
+2
-0
GL3DRenderer.cxx
chart2/source/view/main/GL3DRenderer.cxx
+9
-4
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
f9d2de85
...
@@ -99,6 +99,7 @@ void RenderThread::renderFrame()
...
@@ -99,6 +99,7 @@ void RenderThread::renderFrame()
mpChart
->
mpRenderer
->
SetSize
(
aSize
);
mpChart
->
mpRenderer
->
SetSize
(
aSize
);
if
(
mpChart
->
mbNeedsNewRender
)
if
(
mpChart
->
mbNeedsNewRender
)
{
{
mpChart
->
mpRenderer
->
ReleaseTextTexture
();
for
(
boost
::
ptr_vector
<
opengl3D
::
Renderable3DObject
>::
iterator
itr
=
mpChart
->
maShapes
.
begin
(),
for
(
boost
::
ptr_vector
<
opengl3D
::
Renderable3DObject
>::
iterator
itr
=
mpChart
->
maShapes
.
begin
(),
itrEnd
=
mpChart
->
maShapes
.
end
();
itr
!=
itrEnd
;
++
itr
)
itrEnd
=
mpChart
->
maShapes
.
end
();
itr
!=
itrEnd
;
++
itr
)
{
{
...
...
chart2/source/view/inc/GL3DRenderer.hxx
Dosyayı görüntüle @
f9d2de85
...
@@ -203,6 +203,7 @@ public:
...
@@ -203,6 +203,7 @@ public:
void
ReleaseShapes
();
void
ReleaseShapes
();
void
ReleaseScreenTextShapes
();
void
ReleaseScreenTextShapes
();
void
ReleaseTextTexture
();
private
:
private
:
void
MoveModelf
(
const
PosVecf3
&
trans
,
const
PosVecf3
&
angle
,
const
PosVecf3
&
scale
);
void
MoveModelf
(
const
PosVecf3
&
trans
,
const
PosVecf3
&
angle
,
const
PosVecf3
&
scale
);
...
@@ -435,6 +436,7 @@ private:
...
@@ -435,6 +436,7 @@ private:
glm
::
vec4
m_LightColor
[
MAX_LIGHT_NUM
];
glm
::
vec4
m_LightColor
[
MAX_LIGHT_NUM
];
glm
::
vec4
m_PositionWorldspace
[
MAX_LIGHT_NUM
];
glm
::
vec4
m_PositionWorldspace
[
MAX_LIGHT_NUM
];
float
m_fLightPower
[
MAX_LIGHT_NUM
];
float
m_fLightPower
[
MAX_LIGHT_NUM
];
std
::
vector
<
GLuint
>
m_Texturelist
;
};
};
}
}
...
...
chart2/source/view/main/GL3DRenderer.cxx
Dosyayı görüntüle @
f9d2de85
...
@@ -1707,6 +1707,7 @@ void OpenGL3DRenderer::CreateTextTextureSingle(const boost::shared_array<sal_uIn
...
@@ -1707,6 +1707,7 @@ void OpenGL3DRenderer::CreateTextTextureSingle(const boost::shared_array<sal_uIn
glBindTexture
(
GL_TEXTURE_2D
,
0
);
glBindTexture
(
GL_TEXTURE_2D
,
0
);
CHECK_GL_ERROR
();
CHECK_GL_ERROR
();
m_TextInfoList
.
push_back
(
aTextInfo
);
m_TextInfoList
.
push_back
(
aTextInfo
);
m_Texturelist
.
push_back
(
aTextInfo
.
texture
);
}
}
...
@@ -1796,12 +1797,16 @@ void OpenGL3DRenderer::CreateTextTexture(const boost::shared_array<sal_uInt8> &b
...
@@ -1796,12 +1797,16 @@ void OpenGL3DRenderer::CreateTextTexture(const boost::shared_array<sal_uInt8> &b
void
OpenGL3DRenderer
::
ReleaseTextShapes
()
void
OpenGL3DRenderer
::
ReleaseTextShapes
()
{
{
for
(
size_t
i
=
0
;
i
<
m_TextInfoList
.
size
();
i
++
)
m_TextInfoList
.
clear
();
}
void
OpenGL3DRenderer
::
ReleaseTextTexture
()
{
for
(
size_t
i
=
0
;
i
<
m_Texturelist
.
size
();
i
++
)
{
{
TextInfo
&
textInfo
=
m_TextInfoList
[
i
];
glDeleteTextures
(
1
,
&
m_Texturelist
[
i
]);
glDeleteTextures
(
1
,
&
textInfo
.
texture
);
}
}
m_Text
InfoL
ist
.
clear
();
m_Text
urel
ist
.
clear
();
}
}
void
OpenGL3DRenderer
::
ReleaseScreenTextShapes
()
void
OpenGL3DRenderer
::
ReleaseScreenTextShapes
()
...
...
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