API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 25th, 2012
119
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.22 KB | None | 0 0
raw download clone embed print report
  1. From 8cc27f42932324c78a0eb6db61f08d9cf719c98e Mon Sep 17 00:00:00 2001
  2. From: natt <foo@bar>
  3. Date: Sun, 25 Mar 2012 18:14:50 -0400
  4. Subject: [PATCH] Mega Man 10 3373S submission encoding hacks
  5.  
  6. ---
  7. Source/Core/VideoCommon/Src/AVIDump.cpp            |   13 +++++++++++++
  8.  Source/Plugins/Plugin_VideoOGL/Src/Render.cpp      |   16 ++++++++--------
  9.  .../Plugins/Plugin_VideoOGL/Src/TextureCache.cpp   |   10 +++++-----
  10.  .../Plugin_VideoOGL/Src/TextureConverter.cpp       |    4 ++--
  11.  .../Plugin_VideoSoftware/Src/HwRasterizer.cpp      |    4 ++--
  12.  5 files changed, 30 insertions(+), 17 deletions(-)
  13.  
  14. diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
  15. index cfd34e5..867daa8 100644
  16. --- a/Source/Core/VideoCommon/Src/AVIDump.cpp
  17. +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp
  18. @@ -153,8 +153,21 @@ void AVIDump::Stop()
  19.     NOTICE_LOG(VIDEO, "Stop");
  20.  }
  21.  
  22. +
  23. +// DUMP HACK
  24. +#include "CoreTiming.h"
  25. +#include "HW\SystemTimers.h"
  26. +
  27.  void AVIDump::AddFrame(char *data)
  28.  {
  29. +   // DUMP HACK
  30. +   static std::FILE *f2 = NULL;
  31. +   if (!f2)
  32. +       f2 = std::fopen ("dolphin_syncout_v2.txt", "w");
  33. +   if (f2)
  34. +       std::fprintf (f2, "%I64i\n", CoreTiming::GetTicks ());
  35. +      
  36. +
  37.     AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, (LPVOID) data, m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer);
  38.     m_totalBytes += m_byteBuffer;
  39.     // Close the recording if the file is more than 2gb
  40. diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
  41. index c8e6677..e05b89c 100644
  42. --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
  43. +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
  44. @@ -1040,8 +1040,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
  45.     glActiveTexture(GL_TEXTURE0);
  46.     glEnable(GL_TEXTURE_RECTANGLE_ARB);
  47.     // Use linear filtering.
  48. -   glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
  49. -   glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
  50. +   glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  51. +   glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  52.  
  53.     // We must call ApplyShader here even if no post proc is selected - it takes
  54.     // care of disabling it in that case. It returns false in case of no post processing.
  55. @@ -1075,12 +1075,12 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
  56.  
  57.                 // The following code disables auto stretch.  Kept for reference.
  58.                 // scale draw area for a 1 to 1 pixel mapping with the draw target
  59. -               //float vScale = (float)fbHeight / (float)dst_rect.GetHeight();
  60. -               //float hScale = (float)fbWidth / (float)dst_rect.GetWidth();
  61. -               //drawRc.top *= vScale;
  62. -               //drawRc.bottom *= vScale;
  63. -               //drawRc.left *= hScale;
  64. -               //drawRc.right *= hScale;
  65. +               float vScale = (float)fbHeight / (float)dst_rect.GetHeight();
  66. +               float hScale = (float)fbWidth / (float)dst_rect.GetWidth();
  67. +               drawRc.top *= vScale;
  68. +               drawRc.bottom *= vScale;
  69. +               drawRc.left *= hScale;
  70. +               drawRc.right *= hScale;
  71.             }
  72.             else
  73.             {
  74. diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
  75. index 4a9431a..b4f6c92 100644
  76. --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
  77. +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
  78. @@ -248,8 +248,8 @@ TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
  79.    
  80.     GL_REPORT_ERRORD();
  81.  
  82. -   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
  83. -   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
  84. +   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  85. +   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  86.  
  87.     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
  88.     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
  89. @@ -348,7 +348,7 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co
  90.     //mode1 = newmode1;
  91.  
  92.     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
  93. -       (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST);
  94. +       (newmode.mag_filter || g_Config.bForceFiltering) ? /*GL_LINEAR*/ GL_NEAREST: GL_NEAREST);
  95.  
  96.     if (bHaveMipMaps)
  97.     {
  98. @@ -357,14 +357,14 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co
  99.             mode.min_filter += 4; // take equivalent forced linear
  100.  
  101.         int filt = newmode.min_filter;            
  102. -       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]);
  103. +       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & /*7*/ 3]);
  104.         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod >> 4);
  105.         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod >> 4);
  106.         glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (newmode.lod_bias / 32.0f));
  107.     }
  108.     else
  109.         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
  110. -           (g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
  111. +           (g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? /*GL_LINEAR*/ GL_NEAREST: GL_NEAREST);
  112.  
  113.     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]);
  114.     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]);
  115. diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
  116. index 5035322..38bd0e8 100644
  117. --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
  118. +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
  119. @@ -198,8 +198,8 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar
  120.  
  121.     if (linearFilter)
  122.     {
  123. -       glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
  124. -       glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
  125. +       glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  126. +       glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, /*GL_LINEAR*/ GL_NEAREST);
  127.     }
  128.     else
  129.     {
  130. diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
  131. index 8736066..2553935 100644
  132. --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
  133. +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
  134. @@ -52,8 +52,8 @@ namespace HwRasterizer
  135.          cacheEntry.Update();
  136.  
  137.          glBindTexture(GL_TEXTURE_RECTANGLE_ARB, cacheEntry.texture);
  138. -        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
  139. -        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
  140. +        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? /*GL_LINEAR*/ GL_NEAREST: GL_NEAREST);
  141. +        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? /*GL_LINEAR*/ GL_NEAREST: GL_NEAREST);
  142.      }
  143.  
  144.      void BeginTriangles()
  145. --
  146. 1.7.9.msysgit.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!