← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mupen64plus-video-rice/trusty

~ubuntu-branches/ubuntu/trusty/mupen64plus-video-rice/trusty

« back to all changes in this revision

Viewing changes to src/OGLDecodedMux.h

Committer: Package Import Robot
Author(s): Sven Eckelmann
Date: 2013-07-05 22:53:25 UTC
mfrom: (1.2.2) (3.1.9 experimental)
Revision ID: package-import@ubuntu.com-20130705225325-k0fbb2m44xnrju66

Tags: 2.0-1

* New Upstream Version
* Upload to unstable
* debian/control:
  - Build-Depend on debhelper 9.20130604 for support of parameters when
    detecting targets in dh_auto_*
* debian/rules:
  - Work around new debhelper 9.20130624 dh_auto_{clean,test} behavior
    which is causing a FTBFS by adding an explicit
    override_dh_auto_{clean,test} rule
* debian/watch:
  - Verify new upstream versions using GPG key 954F81B094AA5BB226F5

files added:
.pc/.quilt_patches

.pc/.quilt_series

debian/source/include-binaries

debian/upstream-signing-key.pgp

projects/msvc11

projects/msvc11/mupen64plus-video-rice.vcxproj

src/OGLES2FragmentShaders.cpp

src/OGLES2FragmentShaders.h

src/osal_opengl.h

files removed:
.pc/gcc_lto.patch

.pc/gcc_lto.patch/projects

.pc/gcc_lto.patch/projects/unix

.pc/gcc_lto.patch/projects/unix/Makefile

.pc/non-pic-build.patch

.pc/non-pic-build.patch/src

.pc/non-pic-build.patch/src/FrameBuffer.cpp

debian/patches

debian/patches/gcc_lto.patch

debian/patches/non-pic-build.patch

debian/patches/series

files modified:
.pc/applied-patches

LICENSES

README

RELEASE

debian/changelog

debian/control

debian/copyright

debian/rules

debian/watch

projects/unix/Makefile

src/COLOR.h

src/Combiner.cpp

src/Combiner.h

src/Config.cpp

src/Config.h

src/ConvertImage.cpp

src/ConvertImage.h

src/ConvertImage16.cpp

src/CritSect.h

src/Debugger.cpp

src/Debugger.h

src/DecodedMux.cpp

src/DecodedMux.h

src/DeviceBuilder.cpp

src/DirectXDecodedMux.cpp

src/FrameBuffer.cpp

src/FrameBuffer.h

src/GeneralCombiner.cpp

src/GraphicsContext.cpp

src/GraphicsContext.h

src/OGLCombiner.cpp

src/OGLCombinerNV.cpp

src/OGLDebug.h

src/OGLDecodedMux.cpp

src/OGLDecodedMux.h

src/OGLExtCombiner.cpp

src/OGLExtCombiner.h

src/OGLExtRender.cpp

src/OGLExtRender.h

src/OGLFragmentShaders.cpp

src/OGLGraphicsContext.cpp

src/OGLGraphicsContext.h

src/OGLRender.cpp

src/OGLRenderExt.cpp

src/OGLTexture.cpp

src/OGLTexture.h

src/RSP_GBI0.h

src/RSP_GBI1.h

src/RSP_GBI2.h

src/RSP_GBI2_ext.h

src/RSP_GBI_Others.h

src/RSP_GBI_Sprite2D.h

src/RSP_Parser.cpp

src/RSP_S2DEX.cpp

src/Render.cpp

src/RenderBase.cpp

src/RenderBase.h

src/RenderExt.cpp

src/RenderTexture.cpp

src/TextureFilters.cpp

src/TextureManager.cpp

src/TextureManager.h

src/VectorMath.cpp

src/VectorMath.h

src/Video.cpp

src/Video.h

src/liblinux/pngrw.c

src/liblinux/pngrw.h

src/osal_files.h

src/osal_preproc.h

src/version.h

src/video_api_export.ver

Show diffs side-by-side

added added

removed removed

src/OGLDecodedMux.h

26

26

protected:

27

27

virtual void Simplify(void);

28

28

virtual void Reformat(void);

29

30

29

};

31

30

32

31

class COGLExtDecodedMux : public COGLDecodedMux

40

39

{

41

40

protected:

42

41

virtual void FurtherFormatForOGL2(void);

43

44

42

};

45

43

46

44

#endif

Older »