mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

Use unordered maps in some hot paths (#566)

Browse Source 
* Use unordered maps in some hot paths

* Address PR comments
This commit is contained in:
David Chavez 2022-07-06 01:29:57 +02:00 committed by GitHub
parent f865db5444
commit c5e84c17a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libultraship/libultraship/Archive.h
View File

@ -6,6 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include <map> #include <map>
#include <unordered_map>
#include <string> #include <string>
#include <vector> #include <vector>
#include "Resource.h" #include "Resource.h"
@ -45,7 +46,7 @@ namespace Ship
std::string PatchesPath; std::string PatchesPath;
std::map<std::string, HANDLE> mpqHandles; std::map<std::string, HANDLE> mpqHandles;
std::vector<std::string> addedFiles; std::vector<std::string> addedFiles;
std::map<uint64_t, std::string> hashes; std::unordered_map<uint64_t, std::string> hashes;
HANDLE mainMPQ; HANDLE mainMPQ;
bool LoadMainMPQ(bool enableWriting, bool genCRCMap); bool LoadMainMPQ(bool enableWriting, bool genCRCMap);

7
libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
View File

@ -4,6 +4,9 @@
#include <vector> #include <vector>
#include <cmath> #include <cmath>
#include <map>
#include <unordered_map>
#include <windows.h> #include <windows.h>
#include <versionhelpers.h> #include <versionhelpers.h>
#include <wrl/client.h> #include <wrl/client.h>
@ -902,7 +905,7 @@ FilteringMode gfx_d3d11_get_texture_filter(void) {
return d3d.current_filter_mode; return d3d.current_filter_mode;
} }
std::map<std::pair<float, float>, uint16_t> gfx_d3d11_get_pixel_depth(int fb_id, const std::set<std::pair<float, float>>& coordinates) { std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> gfx_d3d11_get_pixel_depth(int fb_id, const std::set<std::pair<float, float>>& coordinates) {
Framebuffer& fb = d3d.framebuffers[fb_id]; Framebuffer& fb = d3d.framebuffers[fb_id];
TextureData& td = d3d.textures[fb.texture_id]; TextureData& td = d3d.textures[fb.texture_id];
@ -990,7 +993,7 @@ std::map<std::pair<float, float>, uint16_t> gfx_d3d11_get_pixel_depth(int fb_id,
d3d.context->CopyResource(d3d.depth_value_output_buffer_copy.Get(), d3d.depth_value_output_buffer.Get()); d3d.context->CopyResource(d3d.depth_value_output_buffer_copy.Get(), d3d.depth_value_output_buffer.Get());
ThrowIfFailed(d3d.context->Map(d3d.depth_value_output_buffer_copy.Get(), 0, D3D11_MAP_READ, 0, &ms)); ThrowIfFailed(d3d.context->Map(d3d.depth_value_output_buffer_copy.Get(), 0, D3D11_MAP_READ, 0, &ms));
std::map<std::pair<float, float>, uint16_t> res; std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> res;
{ {
size_t i = 0; size_t i = 0;
for (const auto& coord : coordinates) { for (const auto& coord : coordinates) {

5
libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
View File

@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <map> #include <map>
#include <unordered_map>
#ifndef _LANGUAGE_C #ifndef _LANGUAGE_C
#define _LANGUAGE_C #define _LANGUAGE_C
@ -872,8 +873,8 @@ void gfx_opengl_select_texture_fb(int fb_id) {
glBindTexture(GL_TEXTURE_2D, framebuffers[fb_id].clrbuf); glBindTexture(GL_TEXTURE_2D, framebuffers[fb_id].clrbuf);
} }
static std::map<std::pair<float, float>, uint16_t> gfx_opengl_get_pixel_depth(int fb_id, const std::set<std::pair<float, float>>& coordinates) { static std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> gfx_opengl_get_pixel_depth(int fb_id, const std::set<std::pair<float, float>>& coordinates) {
std::map<std::pair<float, float>, uint16_t> res; std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> res;
Framebuffer& fb = framebuffers[fb_id]; Framebuffer& fb = framebuffers[fb_id];

49
libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
View File

@ -216,7 +216,7 @@ static map<int, FBInfo>::iterator active_fb;
static map<int, FBInfo> framebuffers; static map<int, FBInfo> framebuffers;
static set<pair<float, float>> get_pixel_depth_pending; static set<pair<float, float>> get_pixel_depth_pending;
static map<pair<float, float>, uint16_t> get_pixel_depth_cached; static unordered_map<pair<float, float>, uint16_t, hash_pair_ff> get_pixel_depth_cached;
#ifdef _WIN32 #ifdef _WIN32
// TODO: Properly implement for MSVC // TODO: Properly implement for MSVC
@ -901,6 +901,7 @@ static void calculate_normal_dir(const Light_t *light, float coeffs[3]) {
light->dir[1] / 127.0f, light->dir[1] / 127.0f,
light->dir[2] / 127.0f light->dir[2] / 127.0f
}; };
gfx_transposed_matrix_mul(coeffs, light_dir, rsp.modelview_matrix_stack[rsp.modelview_matrix_stack_size - 1]); gfx_transposed_matrix_mul(coeffs, light_dir, rsp.modelview_matrix_stack[rsp.modelview_matrix_stack_size - 1]);
gfx_normalize_vector(coeffs); gfx_normalize_vector(coeffs);
} }
@ -1003,16 +1004,6 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
const Vtx_tn *vn = &vertices[i].n; const Vtx_tn *vn = &vertices[i].n;
struct LoadedVertex *d = &rsp.loaded_vertices[dest_index]; struct LoadedVertex *d = &rsp.loaded_vertices[dest_index];
if (markerOn)
{
int bp = 0;
}
if ((uintptr_t)vertices == 0x14913ec0)
{
int bp = 0;
}
if (v == NULL) if (v == NULL)
return; return;
@ -1021,11 +1012,6 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
float z = v->ob[0] * rsp.MP_matrix[0][2] + v->ob[1] * rsp.MP_matrix[1][2] + v->ob[2] * rsp.MP_matrix[2][2] + rsp.MP_matrix[3][2]; float z = v->ob[0] * rsp.MP_matrix[0][2] + v->ob[1] * rsp.MP_matrix[1][2] + v->ob[2] * rsp.MP_matrix[2][2] + rsp.MP_matrix[3][2];
float w = v->ob[0] * rsp.MP_matrix[0][3] + v->ob[1] * rsp.MP_matrix[1][3] + v->ob[2] * rsp.MP_matrix[2][3] + rsp.MP_matrix[3][3]; float w = v->ob[0] * rsp.MP_matrix[0][3] + v->ob[1] * rsp.MP_matrix[1][3] + v->ob[2] * rsp.MP_matrix[2][3] + rsp.MP_matrix[3][3];
if (markerOn)
{
int bp = 0;
}
x = gfx_adjust_x_for_aspect_ratio(x); x = gfx_adjust_x_for_aspect_ratio(x);
short U = v->tc[0] * rsp.texture_scaling_factor.s >> 16; short U = v->tc[0] * rsp.texture_scaling_factor.s >> 16;
@ -1077,10 +1063,8 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
dotx /= 127.0f; dotx /= 127.0f;
doty /= 127.0f; doty /= 127.0f;
if (dotx < -1.0f) dotx = -1.0f; std::clamp(dotx, -1.0f, 1.0f);
if (dotx > 1.0f) dotx = 1.0f; std::clamp(doty, -1.0f, 1.0f);
if (doty < -1.0f) doty = -1.0f;
if (doty > 1.0f) doty = 1.0f;
if (rsp.geometry_mode & G_TEXTURE_GEN_LINEAR) { if (rsp.geometry_mode & G_TEXTURE_GEN_LINEAR) {
// Not sure exactly what formula we should use to get accurate values // Not sure exactly what formula we should use to get accurate values
@ -1088,8 +1072,8 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
doty = (2.906921f * doty * doty + 1.36114f) * doty; doty = (2.906921f * doty * doty + 1.36114f) * doty;
dotx = (dotx + 1.0f) / 4.0f; dotx = (dotx + 1.0f) / 4.0f;
doty = (doty + 1.0f) / 4.0f;*/ doty = (doty + 1.0f) / 4.0f;*/
dotx = acosf(-dotx) /*/ (3.14159265f)*/ / 4.0f; dotx = acosf(-dotx) /* M_PI */ / 4.0f;
doty = acosf(-doty) /*/ (3.14159265f)*/ / 4.0f; doty = acosf(-doty) /* M_PI */ / 4.0f;
} }
else { else {
dotx = (dotx + 1.0f) / 4.0f; dotx = (dotx + 1.0f) / 4.0f;
@ -1110,12 +1094,12 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
// trivial clip rejection // trivial clip rejection
d->clip_rej = 0; d->clip_rej = 0;
if (x < -w) d->clip_rej |= 1; if (x < -w) d->clip_rej |= 1; // CLIP_LEFT
if (x > w) d->clip_rej |= 2; if (x > w) d->clip_rej |= 2; // CLIP_RIGHT
if (y < -w) d->clip_rej |= 4; if (y < -w) d->clip_rej |= 4; // CLIP_BOTTOM
if (y > w) d->clip_rej |= 8; if (y > w) d->clip_rej |= 8; // CLIP_TOP
//if (z < -w) d->clip_rej |= 16; // if (z < -w) d->clip_rej |= 16; // CLIP_NEAR
if (z > w) d->clip_rej |= 32; if (z > w) d->clip_rej |= 32; // CLIP_FAR
d->x = x; d->x = x;
d->y = y; d->y = y;
@ -1129,13 +1113,10 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
} }
float winv = 1.0f / w; float winv = 1.0f / w;
if (winv < 0.0f) { if (winv < 0.0f) winv = std::numeric_limits<int16_t>::max();
winv = 32767.0f;
}
float fog_z = z * winv * rsp.fog_mul + rsp.fog_offset; float fog_z = z * winv * rsp.fog_mul + rsp.fog_offset;
if (fog_z < 0) fog_z = 0; std::clamp(fog_z, 0.0f, 255.0f);
if (fog_z > 255) fog_z = 255;
d->color.a = fog_z; // Use alpha variable to store fog factor d->color.a = fog_z; // Use alpha variable to store fog factor
} else { } else {
d->color.a = v->cn[3]; d->color.a = v->cn[3];
@ -2881,7 +2862,7 @@ uint16_t gfx_get_pixel_depth(float x, float y) {
get_pixel_depth_pending.emplace(x, y); get_pixel_depth_pending.emplace(x, y);
map<pair<float, float>, uint16_t> res = gfx_rapi->get_pixel_depth(game_renders_to_framebuffer ? game_framebuffer : 0, get_pixel_depth_pending); unordered_map<pair<float, float>, uint16_t, hash_pair_ff> res = gfx_rapi->get_pixel_depth(game_renders_to_framebuffer ? game_framebuffer : 0, get_pixel_depth_pending);
get_pixel_depth_cached.merge(res); get_pixel_depth_cached.merge(res);
get_pixel_depth_pending.clear(); get_pixel_depth_pending.clear();

14
libultraship/libultraship/Lib/Fast3D/gfx_rendering_api.h
View File

@ -6,6 +6,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <map> #include <map>
#include <unordered_map>
#include <set> #include <set>
struct ShaderProgram; struct ShaderProgram;
@ -21,6 +22,17 @@ enum FilteringMode {
NONE NONE
}; };
// A hash function used to hash a: pair<float, float>
struct hash_pair_ff {
size_t operator()(const std::pair<float, float> &p ) const {
auto hash1 = std::hash<float>{}(p.first);
auto hash2 = std::hash<float>{}(p.second);
// If hash1 == hash2, their XOR is zero.
return (hash1 != hash2) ? hash1 ^ hash2 : hash1;
}
};
struct GfxRenderingAPI { struct GfxRenderingAPI {
struct GfxClipParameters (*get_clip_parameters)(void); struct GfxClipParameters (*get_clip_parameters)(void);
void (*unload_shader)(struct ShaderProgram *old_prg); void (*unload_shader)(struct ShaderProgram *old_prg);
@ -48,7 +60,7 @@ struct GfxRenderingAPI {
void (*start_draw_to_framebuffer)(int fb_id, float noise_scale); void (*start_draw_to_framebuffer)(int fb_id, float noise_scale);
void (*clear_framebuffer)(void); void (*clear_framebuffer)(void);
void (*resolve_msaa_color_buffer)(int fb_id_target, int fb_id_source); void (*resolve_msaa_color_buffer)(int fb_id_target, int fb_id_source);
std::map<std::pair<float, float>, uint16_t> (*get_pixel_depth)(int fb_id, const std::set<std::pair<float, float>>& coordinates); std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> (*get_pixel_depth)(int fb_id, const std::set<std::pair<float, float>>& coordinates);
void *(*get_framebuffer_texture_id)(int fb_id); void *(*get_framebuffer_texture_id)(int fb_id);
void (*select_texture_fb)(int fb_id); void (*select_texture_fb)(int fb_id);
void (*delete_texture)(uint32_t texID); void (*delete_texture)(uint32_t texID);

6
libultraship/libultraship/ResourceMgr.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <map> #include <unordered_map>
#include <string> #include <string>
#include <thread> #include <thread>
#include <queue> #include <queue>
@ -52,8 +52,8 @@ namespace Ship
private: private:
std::weak_ptr<GlobalCtx2> Context; std::weak_ptr<GlobalCtx2> Context;
volatile bool bIsRunning; volatile bool bIsRunning;
std::map<std::string, std::shared_ptr<File>> FileCache; std::unordered_map<std::string, std::shared_ptr<File>> FileCache;
std::map<std::string, std::shared_ptr<Resource>, std::less<>> ResourceCache; std::unordered_map<std::string, std::shared_ptr<Resource>> ResourceCache;
std::queue<std::shared_ptr<File>> FileLoadQueue; std::queue<std::shared_ptr<File>> FileLoadQueue;
std::queue<std::shared_ptr<ResourcePromise>> ResourceLoadQueue; std::queue<std::shared_ptr<ResourcePromise>> ResourceLoadQueue;
std::shared_ptr<Archive> OTR; std::shared_ptr<Archive> OTR;