Skip to content
Permalink
Browse files

video-gliden64: Update to commit 2e0389e.

gonetz/GLideN64@2e0389e

* 2e0389e Load config before About dialog call to get info about current translation.
* 73fcf8d Move TextureCache::m_curUnpackAlignment initialization to TextureCache::_addTexture Mupen64plus set GL_UNPACK_ALIGNMENT to 1 after TextureCache::init(). When TextureCache set GL_UNPACK_ALIGNMENT back to value obtained in init(), it broke text in mupen64plus messages.
* fc8a000 Fix RDRAMSize for non-Windows platforms.
* 2feb8a2 Use glTexStorage2DMultisample for GLES3_1
* d46ed98 Fix wrong set of CHANGED_TEXTURE flag.
* 13d53a0 Set CHANGED_TILE flag in gDPSetTile.
* e685cbc Rewrite mipmap shader. Less if().
* 09837f8 Replace int uniforms uFb8Bit, uFbFixedAlpha by ivec2 ones.
* 6c062c8 Replace uniforms uMSTex0Enabled, uMSTex1Enabled by vector uniform uMSTexEnabled.
* 7f9a397 Do not use textureLod for fetching normal textures. It kills anisotropic filtering: https://www.opengl.org/wiki/Sampler_(GLSL) Also need to keep in mind issue #232 and not allow mip-mapping for combiners, which do not use it.
* 49efba0 Correct RDRAMtoFrameBuffer::CopyFromRDRAM - need to update combiner's FBInfo before use.
* eabbd25 Change CachedTexture::frameBufferTexture type to enum. Need to separate one-sampled frame buffer textures from multosampled ones.
* dbbb7da Move _isMarioTennisScoreboard() from FrameBufferList to FrameBuffer.
* 663a0d7 Implement multisampled textures fetch in shaders.
* b728ab9 Disable multisampling related code for GLES below 3.1
* f754943 Disable use of depth_compare_shader for platforms, which do not support GL_IMAGE_TEXTURES_SUPPORT
* 1437eb0 Define internal format for depth texture for GLES3
* d1a16d0 Fix memcpy not found on Android.
* e9564ca Disable zelda_monochrome_fragment_shader for platforms without GL_IMAGE_TEXTURES_SUPPORT
* aac3c03 Add define for shader version string.
* 3796315 Fix texturedRectShadowMap for platforms without GL_IMAGE_TEXTURES_SUPPORT
* 81c003a Add GLES3 headers include to OpenGL.h
* f95804d Fix vertex_shader_notex for GLES
* e819e3c Remove obsolete code from Textures.h
* 09b78ea Replace define GLES3 by GLES3_1 since current code is GLES3.1 compatible. GLES3 is different.
* a550f70 Add extern "C" for functions in glState.h Thanks Gillou68310 for hint.
* 243e186 Correct internal format for DepthBufferToRDRAM color texture.
* d3f6754 Correct depth texture intarnal format for GLES3
* 0a89aa9 Make Shaders GLES3.1 compatible.
* e4e6c27 Fix fragment shader creation for GLES.
* c53dac8 Temporal stub for PluginAPI::FindPluginPath
* 107a81d Don't init from/to RDRAM objects when frame buffer emulation is off.
* 94ec380 Use GL_R16 as internal type for unsigned short textures for GL and GL_R16UI for GL ES.
* a68db29 Remove Android project. Mupen64Plus AE uses main android makefile.
* 0f8f8c3 Move video_api_export.ver to mupenplus folder.
* 4e4f0d1 Replace 1D textures by 2D ones
* 01807a0 Fix FrameBuffer_CopyDepthBuffer: return false for GLES2 case.
* 1210214 Add TxFilterStub.cpp for GL ES. Temporal solution to avoid compilation errors.
* 759578f Replace TextDrawer by TextDrawerStub for GL ES.
* 2bf72ab Correct filename case in includes.
* 6afe5fe Disable anisotropy for GL ES
* ded8893 Remove use of obsolete texture type GL_LUMINANCE8_ALPHA8.
* 2f2a22e Move video_api_export.ver to projects/android folder.
* f7b2713 Enable GL_IMAGE_TEXTURES_SUPPORT for GLES3
* a02d284 Use glTexStorage2DMultisample instead of glTexImage2DMultisample in case of GLSE3
* 70b1b9a Replace glMapBuffer by GLES3 compatible glMapBufferRange.
* 82ce16f Add new defines: GLESX for any GL ES version and GLES3 for GL ES 3.1 Guard GL ES incompatible code with GLESX
* bd5740e Disable GL_CLIP_DISTANCE for GLES
* d894d46 Correct android project: - enable c++11 - switch to GLES3 - change module name
* e8d8ee9 Correct RSP_SegmentToPhysical
* bbc71c3 Fix crash in FrameBufferToRDRAM::CopyToRDRAM when current buffer is NULL.
* cd0c74d Enable translations for About dialog.
* 5329a2a Fix txPath save/load.
* a1fdd33 Add Portuguese and Spanish translations to project file.
  • Loading branch information
littleguy77 committed May 15, 2015
1 parent 808a0b3 commit 74130120c96fb5578b2303ebd8008bf4044c60a3
Showing with 69,296 additions and 1 deletion.
  1. +9 −1 jni/mupen64plus-video-gliden64/.gitignore
  2. +359 −0 jni/mupen64plus-video-gliden64/LICENCE
  3. +4 −0 jni/mupen64plus-video-gliden64/README.md
  4. +339 −0 jni/mupen64plus-video-gliden64/licenses/GlideHQ/gpl-2.0.txt
  5. +25 −0 jni/mupen64plus-video-gliden64/licenses/Glow/LICENSE
  6. +165 −0 jni/mupen64plus-video-gliden64/licenses/gles2n64/LICENSE
  7. +8 −0 jni/mupen64plus-video-gliden64/projects/cmake/Readme.txt
  8. +31 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.sln
  9. +395 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.vcxproj
  10. +335 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.vcxproj.filters
  11. +33 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideNHQ.sln
  12. +289 −0 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj
  13. +55 −0 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj.filters
  14. +46 −0 jni/mupen64plus-video-gliden64/src/3DMath.cpp
  15. +169 −0 jni/mupen64plus-video-gliden64/src/3DMath.h
  16. +188 −0 jni/mupen64plus-video-gliden64/src/CMakeLists.txt
  17. +82 −0 jni/mupen64plus-video-gliden64/src/CRC.cpp
  18. +9 −0 jni/mupen64plus-video-gliden64/src/CRC.h
  19. +295 −0 jni/mupen64plus-video-gliden64/src/Combiner.cpp
  20. +163 −0 jni/mupen64plus-video-gliden64/src/Combiner.h
  21. +66 −0 jni/mupen64plus-video-gliden64/src/CommonPluginAPI.cpp
  22. +76 −0 jni/mupen64plus-video-gliden64/src/Config.cpp
  23. +130 −0 jni/mupen64plus-video-gliden64/src/Config.h
  24. +8 −0 jni/mupen64plus-video-gliden64/src/Debug.h
  25. +348 −0 jni/mupen64plus-video-gliden64/src/DepthBuffer.cpp
  26. +83 −0 jni/mupen64plus-video-gliden64/src/DepthBuffer.h
  27. +300 −0 jni/mupen64plus-video-gliden64/src/F3D.cpp
  28. +97 −0 jni/mupen64plus-video-gliden64/src/F3D.h
  29. +142 −0 jni/mupen64plus-video-gliden64/src/F3DDKR.cpp
  30. +16 −0 jni/mupen64plus-video-gliden64/src/F3DDKR.h
  31. +91 −0 jni/mupen64plus-video-gliden64/src/F3DEX.cpp
  32. +54 −0 jni/mupen64plus-video-gliden64/src/F3DEX.h
  33. +205 −0 jni/mupen64plus-video-gliden64/src/F3DEX2.cpp
  34. +88 −0 jni/mupen64plus-video-gliden64/src/F3DEX2.h
  35. +116 −0 jni/mupen64plus-video-gliden64/src/F3DEX2CBFD.cpp
  36. +8 −0 jni/mupen64plus-video-gliden64/src/F3DEX2CBFD.h
  37. +60 −0 jni/mupen64plus-video-gliden64/src/F3DPD.cpp
  38. +8 −0 jni/mupen64plus-video-gliden64/src/F3DPD.h
  39. +68 −0 jni/mupen64plus-video-gliden64/src/F3DSWSE.cpp
  40. +7 −0 jni/mupen64plus-video-gliden64/src/F3DSWSE.h
  41. +73 −0 jni/mupen64plus-video-gliden64/src/F3DWRUS.cpp
  42. +8 −0 jni/mupen64plus-video-gliden64/src/F3DWRUS.h
  43. +1,330 −0 jni/mupen64plus-video-gliden64/src/FrameBuffer.cpp
  44. +115 −0 jni/mupen64plus-video-gliden64/src/FrameBuffer.h
  45. +100 −0 jni/mupen64plus-video-gliden64/src/FrameBufferEmulationIssues.txt
  46. +310 −0 jni/mupen64plus-video-gliden64/src/GBI.cpp
  47. +752 −0 jni/mupen64plus-video-gliden64/src/GBI.h
  48. +1,243 −0 jni/mupen64plus-video-gliden64/src/GLSLCombiner.cpp
  49. +214 −0 jni/mupen64plus-video-gliden64/src/GLSLCombiner.h
  50. +3 −0 jni/mupen64plus-video-gliden64/src/GLideN64.cpp
  51. +8 −0 jni/mupen64plus-video-gliden64/src/GLideN64.h
  52. +140 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/CMakeLists.txt
  53. +172 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/Ext_TxFilter.cpp
  54. +246 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/Ext_TxFilter.h
  55. +79 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/GlideHQ.rc
  56. +94 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/README.txt
  57. +727 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters.cpp
  58. +82 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters.h
  59. +155 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_2xsai.cpp
  60. +145 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_2xsai.h
  61. +1,510 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq2x.cpp
  62. +1,847 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq2x.h
  63. +835 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq4x.cpp
  64. +4,999 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq4x.h
  65. +1,307 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_lq2x.h
  66. +1,243 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_xbrz.cpp
  67. +107 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_xbrz.h
  68. +428 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxCache.cpp
  69. +69 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxCache.h
  70. +75 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxDbg.cpp
  71. +61 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxDbg.h
  72. +628 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilter.cpp
  73. +82 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilter.h
  74. +106 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilterExport.cpp
  75. +754 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxHiResCache.cpp
  76. +61 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxHiResCache.h
  77. +728 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxImage.cpp
  78. +115 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxImage.h
  79. +56 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxInternal.h
  80. +980 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxQuantize.cpp
  81. +69 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxQuantize.h
  82. +361 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxReSample.cpp
  83. +45 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxReSample.h
  84. +79 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxTexCache.cpp
  85. +39 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxTexCache.h
  86. +609 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxUtil.cpp
  87. +77 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxUtil.h
  88. +27 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/bldno.cpp
  89. +2 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/bldno.h
  90. +339 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/gpl-2.0.txt
  91. +2,686 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/png.h
  92. +1,510 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/pngconf.h
  93. +332 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/zconf.h
  94. +1,357 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/zlib.h
  95. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/libpng.lib
  96. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/libpngd.lib
  97. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/zlib.lib
  98. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/zlibd.lib
  99. +33 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/CMakeLists.txt
  100. +70 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/Makefile.gcc
  101. +68 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/Makefile.vc8
  102. +120 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/test.cpp
  103. +14 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.cpp
  104. +22 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.h
  105. +527 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.ui
  106. +429 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ConfigDialog.cpp
  107. +47 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ConfigDialog.h
  108. +14 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/FullscreenResolutions.h
  109. +93 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.cpp
  110. +26 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.h
  111. +41 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.pro
  112. +25 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.sln
  113. +248 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.vcxproj
  114. +135 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.vcxproj.filters
  115. BIN jni/mupen64plus-video-gliden64/src/GLideNUI/Icon.png
  116. +35 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ScreenShot.cpp
  117. +241 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/Settings.cpp
  118. +10 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/Settings.h
  119. +1,380 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/configDialog.ui
  120. +123 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/fullscreenresolutions_windows.cpp
  121. +5 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/icon.qrc
  122. +125 −0 jni/mupen64plus-video-gliden64/src/Keys.cpp
  123. +95 −0 jni/mupen64plus-video-gliden64/src/Keys.h
  124. +58 −0 jni/mupen64plus-video-gliden64/src/L3D.cpp
  125. +10 −0 jni/mupen64plus-video-gliden64/src/L3D.h
  126. +62 −0 jni/mupen64plus-video-gliden64/src/L3DEX.cpp
  127. +8 −0 jni/mupen64plus-video-gliden64/src/L3DEX.h
  128. +62 −0 jni/mupen64plus-video-gliden64/src/L3DEX2.cpp
  129. +10 −0 jni/mupen64plus-video-gliden64/src/L3DEX2.h
  130. +43 −0 jni/mupen64plus-video-gliden64/src/Log.h
  131. +61 −0 jni/mupen64plus-video-gliden64/src/MupenPlusPluginAPI.cpp
  132. +13 −0 jni/mupen64plus-video-gliden64/src/N64.cpp
  133. +53 −0 jni/mupen64plus-video-gliden64/src/N64.h
  134. +1,405 −0 jni/mupen64plus-video-gliden64/src/OpenGL.cpp
  135. +238 −0 jni/mupen64plus-video-gliden64/src/OpenGL.h
  136. +109 −0 jni/mupen64plus-video-gliden64/src/PluginAPI.h
  137. +406 −0 jni/mupen64plus-video-gliden64/src/PostProcessor.cpp
  138. +38 −0 jni/mupen64plus-video-gliden64/src/PostProcessor.h
  139. +603 −0 jni/mupen64plus-video-gliden64/src/RDP.cpp
  140. +24 −0 jni/mupen64plus-video-gliden64/src/RDP.h
  141. +335 −0 jni/mupen64plus-video-gliden64/src/RSP.cpp
  142. +26 −0 jni/mupen64plus-video-gliden64/src/RSP.h
  143. +1 −0 jni/mupen64plus-video-gliden64/src/Revision.h
  144. +113 −0 jni/mupen64plus-video-gliden64/src/S2DEX.cpp
  145. +204 −0 jni/mupen64plus-video-gliden64/src/S2DEX.h
  146. +44 −0 jni/mupen64plus-video-gliden64/src/S2DEX2.cpp
  147. +19 −0 jni/mupen64plus-video-gliden64/src/S2DEX2.h
  148. +655 −0 jni/mupen64plus-video-gliden64/src/Shaders.h
  149. +323 −0 jni/mupen64plus-video-gliden64/src/TextDrawer.cpp
  150. +21 −0 jni/mupen64plus-video-gliden64/src/TextDrawer.h
  151. +11 −0 jni/mupen64plus-video-gliden64/src/TextDrawerStub.cpp
  152. +1,427 −0 jni/mupen64plus-video-gliden64/src/Textures.cpp
  153. +123 −0 jni/mupen64plus-video-gliden64/src/Textures.h
  154. +151 −0 jni/mupen64plus-video-gliden64/src/Turbo3D.cpp
  155. +6 −0 jni/mupen64plus-video-gliden64/src/Turbo3D.h
  156. +44 −0 jni/mupen64plus-video-gliden64/src/TxFilterStub.cpp
  157. +43 −0 jni/mupen64plus-video-gliden64/src/Types.h
  158. +173 −0 jni/mupen64plus-video-gliden64/src/VI.cpp
  159. +25 −0 jni/mupen64plus-video-gliden64/src/VI.h
  160. +643 −0 jni/mupen64plus-video-gliden64/src/ZSort.cpp
  161. +6 −0 jni/mupen64plus-video-gliden64/src/ZSort.h
  162. +283 −0 jni/mupen64plus-video-gliden64/src/ZilmarGFX_1_3.h
  163. +51 −0 jni/mupen64plus-video-gliden64/src/ZilmarPluginAPI.cpp
  164. +191 −0 jni/mupen64plus-video-gliden64/src/common/CommonAPIImpl_common.cpp
  165. +587 −0 jni/mupen64plus-video-gliden64/src/convert.h
  166. +1,286 −0 jni/mupen64plus-video-gliden64/src/gDP.cpp
  167. +290 −0 jni/mupen64plus-video-gliden64/src/gDP.h
  168. +2,442 −0 jni/mupen64plus-video-gliden64/src/gSP.cpp
  169. +212 −0 jni/mupen64plus-video-gliden64/src/gSP.h
  170. +3 −0 jni/mupen64plus-video-gliden64/src/getRevision.sh
  171. +45 −0 jni/mupen64plus-video-gliden64/src/glState.cpp
  172. +327 −0 jni/mupen64plus-video-gliden64/src/glState.h
  173. +39 −0 jni/mupen64plus-video-gliden64/src/inc/callbacks.h
  174. +30 −0 jni/mupen64plus-video-gliden64/src/inc/config.h
  175. +46 −0 jni/mupen64plus-video-gliden64/src/inc/debugger.h
  176. +13,142 −0 jni/mupen64plus-video-gliden64/src/inc/glext.h
  177. +90 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_common.h
  178. +242 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_config.h
  179. +202 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_debugger.h
  180. +141 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_frontend.h
  181. +271 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_plugin.h
  182. +351 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_types.h
  183. +154 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_vidext.h
  184. +38 −0 jni/mupen64plus-video-gliden64/src/inc/vidext.h
  185. +783 −0 jni/mupen64plus-video-gliden64/src/inc/vidext_sdl2_compat.h
  186. +38 −0 jni/mupen64plus-video-gliden64/src/mupenplus/CommonAPIImpl_mupenplus.cpp
  187. +214 −0 jni/mupen64plus-video-gliden64/src/mupenplus/Config_mupenplus.cpp
  188. +49 −0 jni/mupen64plus-video-gliden64/src/mupenplus/GLideN64_mupenplus.h
  189. +125 −0 jni/mupen64plus-video-gliden64/src/mupenplus/MupenPlusAPIImpl.cpp
  190. +131 −0 jni/mupen64plus-video-gliden64/src/mupenplus/OpenGL_mupenplus.cpp
  191. +783 −0 jni/mupen64plus-video-gliden64/src/sdl2_compat.h
  192. +47 −0 jni/mupen64plus-video-gliden64/src/windows/CommonAPIImpl_windows.cpp
  193. +32 −0 jni/mupen64plus-video-gliden64/src/windows/Config_windows.cpp
  194. +69 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions.h
  195. +137 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions_windows.cpp
  196. +14 −0 jni/mupen64plus-video-gliden64/src/windows/GLideN64_windows.cpp
  197. +11 −0 jni/mupen64plus-video-gliden64/src/windows/GLideN64_windows.h
  198. +223 −0 jni/mupen64plus-video-gliden64/src/windows/OpenGL_windows.cpp
  199. +39 −0 jni/mupen64plus-video-gliden64/src/windows/ZilmarAPIImpl_windows.cpp
  200. +127 −0 jni/mupen64plus-video-gliden64/src/winlnxdefs.h
@@ -1 +1,9 @@
*
backup/
Debug*/
Release*/
build*/
Roms/
*.ncb
*.suo
*.sdf
*.user

Large diffs are not rendered by default.

@@ -0,0 +1,4 @@
GLideN64
========

A new generation, open-source graphics plugin for N64 emulators.

Large diffs are not rendered by default.

@@ -0,0 +1,25 @@
Nutty Software Open WebGL Framework

Copyright (C) 2012 Nathaniel Meyer
Nutty Software, http://www.nutty.ca
All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
1. The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
2. Redistributions in binary or minimized form must reproduce the above copyright
notice and this list of conditions in the documentation and/or other materials
provided with the distribution.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
@@ -0,0 +1,8 @@
cmake project files located inside src folder. To build the project with cmake, run

cmake [-DCMAKE_BUILD_TYPE=Debug] [-DOPT=On] -DMUPENPLUSAPI=On ../../src/

-DCMAKE_BUILD_TYPE=Debug - optional parameter, if you want debug build. Default buid type is Release
-DOPT=On - optional parameter. set it if you want to enable additional optimizations (can cause additional bugs).
-DMUPENPLUSAPI=On - currently cmake build works only for mupen64plus version of the plugin.

@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug 1964|Win32 = Debug 1964|Win32
Debug_mupenplus|Win32 = Debug_mupenplus|Win32
Debug|Win32 = Debug|Win32
Release_mupenplus|Win32 = Release_mupenplus|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug 1964|Win32.ActiveCfg = Debug 1964|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug 1964|Win32.Build.0 = Debug 1964|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|Win32.ActiveCfg = Debug_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|Win32.Build.0 = Debug_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug|Win32.ActiveCfg = Debug|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug|Win32.Build.0 = Debug|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.ActiveCfg = Release_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.Build.0 = Release_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

0 comments on commit 7413012

Please sign in to comment.
You can’t perform that action at this time.