Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Seungha Yang
gst-plugins-base
Commits
e48b8033
Commit
e48b8033
authored
Dec 30, 2018
by
Seungha Yang
🐑
Committed by
Matthew Waters
Jan 14, 2019
Browse files
gl: Fix some type conversion warnings with MSVC
MSVC complained about implicit conversion between GstGLFormat* and guint*
parent
b1df1000
Pipeline
#14819
passed with stages
in 15 minutes and 54 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
gst-libs/gst/gl/gstglmemory.c
View file @
e48b8033
...
...
@@ -123,7 +123,8 @@ static inline void
_calculate_unpack_length
(
GstGLMemory
*
gl_mem
,
GstGLContext
*
context
)
{
guint
n_gl_bytes
;
guint
tex_format
,
tex_type
;
GstGLFormat
tex_format
;
guint
tex_type
;
gl_mem
->
tex_scaling
[
0
]
=
1
.
0
f
;
gl_mem
->
tex_scaling
[
1
]
=
1
.
0
f
;
...
...
@@ -237,8 +238,8 @@ static gboolean
_gl_tex_create
(
GstGLMemory
*
gl_mem
,
GError
**
error
)
{
GstGLContext
*
context
=
gl_mem
->
mem
.
context
;
G
Lenum
internal_format
;
G
Lenum
tex_format
;
G
stGLFormat
internal_format
;
G
stGLFormat
tex_format
;
GLenum
tex_type
;
internal_format
=
gl_mem
->
tex_format
;
...
...
@@ -354,7 +355,8 @@ gst_gl_memory_read_pixels (GstGLMemory * gl_mem, gpointer read_pointer)
{
GstGLContext
*
context
=
gl_mem
->
mem
.
context
;
const
GstGLFuncs
*
gl
=
context
->
gl_vtable
;
guint
format
,
type
;
GstGLFormat
format
;
guint
type
;
guint
fbo
;
gst_gl_format_type_from_sized_gl_format
(
gl_mem
->
tex_format
,
&
format
,
&
type
);
...
...
@@ -426,7 +428,8 @@ _gl_tex_download_get_tex_image (GstGLMemory * gl_mem, GstMapInfo * info,
if
(
info
->
flags
&
GST_MAP_READ
&&
GST_MEMORY_FLAG_IS_SET
(
gl_mem
,
GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD
))
{
guint
format
,
type
;
GstGLFormat
format
;
guint
type
;
guint
target
;
GST_CAT_TRACE
(
GST_CAT_GL_MEMORY
,
"attempting download of texture %u "
...
...
@@ -504,7 +507,8 @@ gst_gl_memory_texsubimage (GstGLMemory * gl_mem, gpointer read_pointer)
{
GstGLContext
*
context
=
gl_mem
->
mem
.
context
;
const
GstGLFuncs
*
gl
;
GLenum
gl_format
,
gl_type
,
gl_target
;
GstGLFormat
gl_format
;
GLenum
gl_type
,
gl_target
;
gpointer
data
;
gsize
plane_start
;
...
...
@@ -766,7 +770,8 @@ _gl_tex_copy_thread (GstGLContext * context, gpointer data)
copy_params
=
(
GstGLMemoryCopyParams
*
)
data
;
if
(
!
copy_params
->
tex_id
)
{
guint
internal_format
,
out_gl_format
,
out_gl_type
,
out_tex_target
;
GstGLFormat
internal_format
,
out_gl_format
;
guint
out_gl_type
,
out_tex_target
;
out_tex_target
=
gst_gl_texture_target_to_gl
(
copy_params
->
tex_target
);
internal_format
=
copy_params
->
src
->
tex_format
;
...
...
gst-libs/gst/gl/gstglmemorypbo.c
View file @
e48b8033
...
...
@@ -407,8 +407,8 @@ _gl_mem_copy_thread (GstGLContext * context, gpointer data)
guint
out_tex_target
;
GLuint
fboId
;
gsize
out_width
,
out_height
,
out_stride
;
G
Luin
t
out_gl_format
,
out
_gl_
type
;
GLuint
in
_gl_
format
,
in_gl_type
;
G
stGLForma
t
out_gl_format
,
in
_gl_
format
;
GLuint
out
_gl_
type
,
in_gl_type
;
gsize
in_size
,
out_size
;
copy_params
=
(
GstGLMemoryPBOCopyParams
*
)
data
;
...
...
Write
Preview
Supports
Markdown
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