Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
8ccf96ab
Commit
8ccf96ab
authored
Feb 14, 2012
by
Pierre-Eric Pelloux-Prayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix yuv shader for OpenGL ES
parent
679a2054
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
src/Makefile.am
src/Makefile.am
+6
-4
src/yuv2rgb.fs
src/yuv2rgb.fs
+1
-1
No files found.
src/Makefile.am
View file @
8ccf96ab
...
...
@@ -66,8 +66,6 @@ libmediastreamer_la_SOURCES= mscommon.c $(GITVERSION_FILE) \
#dummy c++ file to force libtool to use c++ linking (because of msdscap-mingw.cc)
nodist_EXTRA_libmediastreamer_la_SOURCES
=
dummy.cxx
nodist_libmediastreamer_la_SOURCES
=
yuv2rgb.fs.h yuv2rgb.fs.h
libmediastreamer_la_SOURCES
+=
audiostream.c
...
...
@@ -130,11 +128,13 @@ endif
if
BUILD_VIDEO
if
BUILD_MACOSX
libmediastreamer_la_SOURCES
+=
qtcapture.m msosxdisplay.m shaders.c shaders.h opengles_display.c opengles_display.h yuv2rgb.vs.h yuv2rgb.fs.h
libmediastreamer_la_SOURCES
+=
qtcapture.m msosxdisplay.m shaders.c shaders.h opengles_display.c opengles_display.h
nodist_libmediastreamer_la_SOURCES
=
yuv2rgb.fs.h yuv2rgb.fs.h
endif
if
BUILD_IOS
libmediastreamer_la_SOURCES
+=
scaler.c iosdisplay.m ioscapture.m shaders.c shaders.h opengles_display.c opengles_display.h yuv2rgb.vs.h yuv2rgb.fs.h
libmediastreamer_la_SOURCES
+=
scaler.c iosdisplay.m ioscapture.m shaders.c shaders.h opengles_display.c opengles_display.h
nodist_libmediastreamer_la_SOURCES
=
yuv2rgb.fs.h yuv2rgb.fs.h
endif
if
BUILD_V4L1
libmediastreamer_la_SOURCES
+=
msv4l.c
...
...
@@ -286,9 +286,11 @@ make_gitversion_h:
$(GITVERSION_FILE)
:
make_gitversion_h
yuv2rgb.fs.h
:
yuv2rgb.fs
cd
$(top_srcdir)
/src
&&
\
xxd
-i
yuv2rgb.fs |
sed
s/
}
\;
/,0x00
}
\;
/
>
yuv2rgb.fs.h
yuv2rgb.vs.h
:
yuv2rgb.vs
cd
$(top_srcdir)
/src
&&
\
xxd
-i
yuv2rgb.vs |
sed
s/
}
\;
/,0x00
}
\;
/
>
yuv2rgb.vs.h
...
...
src/yuv2rgb.fs
View file @
8ccf96ab
#
ifdef
__
arm__
#
ifdef
GL_ES
precision
mediump
float
;
#
endif
uniform
sampler2D
t_texture_y
;
...
...
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