Skip to content
Permalink
Browse files

Merge branch 'realign-glide-upstream'

  • Loading branch information...
littleguy77 committed Dec 12, 2014
2 parents 7ebb565 + bec9434 commit fa36871a83b953b1956eb9aa303faa4047bb44f3
@@ -239,7 +239,7 @@ stipple_mode = 2
stipple_pattern = 1041204192
clip_zmax = 1
clip_zmin = 0
adjust_aspect = 0
adjust_aspect = 1
correct_viewport = 0
aspect = 0
zmode_compare_less = 0
@@ -251,6 +251,7 @@ useless_is_useless = 0
fb_read_always = 0

[1080 SNOWBOARDING]
optimize_texrect = 1
alt_tex_size = 1
swapmode = 2
fb_smart = 1
@@ -296,19 +297,16 @@ filtering = 1
filtering = 1
fb_smart = 1
fb_hires = 1
fb_read_always = 1

[BANJO KAZOOIE 2]
filtering = 1
fb_smart = 1
fb_hires = 1
fb_read_always = 1

[BANJO TOOIE]
filtering = 1
fb_smart = 1
fb_hires = 1
fb_read_always = 1

[BASS HUNTER 64]
buff_clear = 0
@@ -419,7 +417,7 @@ filtering = 1
fog = 0

[CONKER BFD]
optimize_texrect = 0
optimize_texrect = 1
lodmode = 1
filtering = 1
fb_smart = 1
@@ -467,7 +465,6 @@ detect_cpu_write = 1

[DONKEY KONG 64]
lodmode = 1
fb_read_always = 1

[Doom64]

@@ -518,7 +515,7 @@ filtering = 2
[EVANGELION]

[EXCITEBIKE64]
fb_smart = 0
fb_smart = 1
fb_hires = 1

[extreme_g]
@@ -1358,7 +1355,6 @@ filtering = 1
fb_smart = 1
fb_hires = 1


[MUPEN64PLUS]

;End Of Original File
@@ -35,10 +35,8 @@ BOOL Config_Open()
return FALSE;
}
ConfigSetDefaultBool(video_general_section, "Fullscreen", false, "Use fullscreen mode if True, or windowed mode if False");
ConfigSetDefaultBool(video_general_section, "VerticalSync", true, "If true, prevent frame tearing by waiting for vsync before swapping");
ConfigSetDefaultInt(video_general_section, "ScreenWidth", 640, "Width of output window or fullscreen width");
ConfigSetDefaultInt(video_general_section, "ScreenHeight", 480, "Height of output window or fullscreen height");
ConfigSetDefaultInt(video_glide64_section, "wrpAntiAliasing", 0, "Enable full-scene anti-aliasing by setting this to a value greater than 1");
ConfigSetDefaultInt(video_general_section, "Rotate", 0, "Rotate screen contents: 0=0 degree, 1=90 degree, 2 = 180 degree, 3=270 degree");

return TRUE;
@@ -375,21 +375,21 @@ void ReadSettings ()

settings.rotate = Config_ReadScreenInt("Rotate");

settings.vsync = (BOOL)Config_ReadInt ("vsync", "Vertical sync", 1);
settings.vsync = (BOOL)Config_ReadInt ("vsync", "Vertical sync", 0);
settings.ssformat = (BOOL)Config_ReadInt("ssformat", "TODO:ssformat", 0);
//settings.fast_crc = (BOOL)Config_ReadInt ("fast_crc", "Fast CRC", 0);

settings.show_fps = (BYTE)Config_ReadInt ("show_fps", "Display performance stats (add together desired flags): 1=FPS counter, 2=VI/s counter, 4=% speed, 8=FPS transparent", 0, TRUE, FALSE);
settings.clock = (BOOL)Config_ReadInt ("clock", "Clock enabled", 0);
settings.clock_24_hr = (BOOL)Config_ReadInt ("clock_24_hr", "Clock is 24-hour", 1);
settings.clock_24_hr = (BOOL)Config_ReadInt ("clock_24_hr", "Clock is 24-hour", 0);
// settings.advanced_options only good for GUI config
// settings.texenh_options = only good for GUI config
//settings.use_hotkeys = ini->Read(_T("hotkeys"), 1l);

settings.wrpResolution = (BYTE)Config_ReadInt ("wrpResolution", "Wrapper resolution", 0, TRUE, FALSE);
settings.wrpVRAM = (BYTE)Config_ReadInt ("wrpVRAM", "Wrapper VRAM", 0, TRUE, FALSE);
settings.wrpFBO = (BOOL)Config_ReadInt ("wrpFBO", "Wrapper FBO", 1, TRUE, TRUE);
settings.wrpAnisotropic = (BOOL)Config_ReadInt ("wrpAnisotropic", "Wrapper Anisotropic Filtering", 1, TRUE, TRUE);
settings.wrpAnisotropic = (BOOL)Config_ReadInt ("wrpAnisotropic", "Wrapper Anisotropic Filtering", 0, TRUE, TRUE);

#ifndef _ENDUSER_RELEASE_
settings.autodetect_ucode = (BOOL)Config_ReadInt ("autodetect_ucode", "Auto-detect microcode", 1);
@@ -383,7 +383,6 @@ typedef struct {
int wrpVRAM;
int wrpFBO;
int wrpAnisotropic;
int wrpAntiAliasing;

} SETTINGS;

@@ -311,6 +311,7 @@ void init_combiner()
int texture[4] = {0, 0, 0, 0};

glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D);

// creating a fake texture
glBindTexture(GL_TEXTURE_2D, default_texture);
@@ -320,6 +321,7 @@ void init_combiner()

glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, default_texture);
glEnable(GL_TEXTURE_2D);

int rotation_matrix_location;
int texture0_location;
@@ -673,7 +675,6 @@ void compile_shader()
shader_programs[number_of_programs].fogModeEndScale_location = glGetUniformLocation(program_object, "fogModeEndScale");
shader_programs[number_of_programs].fogColor_location = glGetUniformLocation(program_object, "fogColor");
shader_programs[number_of_programs].alphaRef_location = glGetUniformLocation(program_object, "alphaRef");
shader_programs[number_of_programs].chroma_color_location = glGetUniformLocation(program_object, "chroma_color");

update_uniforms(shader_programs[number_of_programs]);

@@ -1801,10 +1802,12 @@ static void setPattern()
}
}
glActiveTexture(GL_TEXTURE2);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 33*1024*1024);
glTexImage2D(GL_TEXTURE_2D, 0, 4, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glDisable(GL_TEXTURE_2D);
}

FX_ENTRY void FX_CALL
@@ -1825,16 +1828,19 @@ grStippleMode( GrStippleMode_t mode )
case GR_STIPPLE_DISABLE:
dither_enabled = 0;
glActiveTexture(GL_TEXTURE2);
glDisable(GL_TEXTURE_2D);
break;
case GR_STIPPLE_PATTERN:
setPattern();
dither_enabled = 1;
glActiveTexture(GL_TEXTURE2);
glEnable(GL_TEXTURE_2D);
break;
case GR_STIPPLE_ROTATE:
setPattern();
dither_enabled = 1;
glActiveTexture(GL_TEXTURE2);
glEnable(GL_TEXTURE_2D);
break;
default:
display_warning("grStippleMode:%x", mode);
@@ -39,9 +39,6 @@
#include "main.h"
#include "m64p.h"

#include <SDL_opengles.h>
//#include <GL/glext.h>

#define OPENGL_CHECK_ERRORS { const GLenum errcode = glGetError(); if (errcode != GL_NO_ERROR) LOG("OpenGL Error code %i in '%s' line %i\n", errcode, __FILE__, __LINE__-1); }

#ifdef VPDEBUG
@@ -1685,7 +1682,7 @@ grAuxBufferExt( GrBuffer_t buffer )
need_to_compile = 1;
}
}
void vbo_draw();

FX_ENTRY void FX_CALL
grBufferClear( GrColor_t color, GrAlpha_t alpha, FxU32 depth )
{

0 comments on commit fa36871

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