mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
nuke more unused stubs
This commit is contained in:
parent
489ca2675d
commit
d9f2cb03c7
|
|
@ -1,68 +0,0 @@
|
||||||
|
|
||||||
#include "platform/stubs.h"
|
|
||||||
|
|
||||||
#include "app/linux/LinuxGame.h"
|
|
||||||
#if defined(__linux__)
|
|
||||||
|
|
||||||
void LinuxLogStubLightmapProbe() {
|
|
||||||
static bool logged = false;
|
|
||||||
if (logged) return;
|
|
||||||
|
|
||||||
logged = true;
|
|
||||||
app.DebugPrintf(
|
|
||||||
"[linux-lightmap] stubs.cpp: Linux excludes the no-op multitexture "
|
|
||||||
"stubs in this file; the runtime uses libGL/4jlibs symbols.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
void glReadPixels(int, int, int, int, int, int, ByteBuffer*) {}
|
|
||||||
|
|
||||||
void glClearDepth(double) {}
|
|
||||||
|
|
||||||
void glVertexPointer(int, int, int, int) {}
|
|
||||||
|
|
||||||
void glVertexPointer(int, int, FloatBuffer*) {}
|
|
||||||
|
|
||||||
void glTexCoordPointer(int, int, int, int) {}
|
|
||||||
|
|
||||||
void glTexCoordPointer(int, int, FloatBuffer*) {}
|
|
||||||
|
|
||||||
void glNormalPointer(int, int, int) {}
|
|
||||||
|
|
||||||
void glNormalPointer(int, ByteBuffer*) {}
|
|
||||||
|
|
||||||
void glEnableClientState(int) {}
|
|
||||||
|
|
||||||
void glDisableClientState(int) {}
|
|
||||||
|
|
||||||
void glColorPointer(int, int, int, int) {}
|
|
||||||
|
|
||||||
void glColorPointer(int, bool, int, ByteBuffer*) {}
|
|
||||||
|
|
||||||
void glDrawArrays(int, int, int) {}
|
|
||||||
|
|
||||||
void glNormal3f(float, float, float) {}
|
|
||||||
|
|
||||||
void glGenQueriesARB(IntBuffer*) {}
|
|
||||||
|
|
||||||
void glBeginQueryARB(int, int) {}
|
|
||||||
|
|
||||||
void glEndQueryARB(int) {}
|
|
||||||
|
|
||||||
void glGetQueryObjectuARB(int, int, IntBuffer*) {}
|
|
||||||
|
|
||||||
void glShadeModel(int) {}
|
|
||||||
|
|
||||||
void glColorMaterial(int, int) {}
|
|
||||||
|
|
||||||
// 1.8.2
|
|
||||||
void glClientActiveTexture(int) {}
|
|
||||||
|
|
||||||
void glActiveTexture(int) {}
|
|
||||||
|
|
||||||
void glFlush() {}
|
|
||||||
|
|
||||||
void glTexGeni(int, int, int) {}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
#ifdef __linux__
|
|
||||||
|
|
||||||
#include "app/common/Game.h"
|
|
||||||
#include "platform/stubs.h"
|
|
||||||
|
|
||||||
void Display::update() {}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -802,7 +802,6 @@ void GameRenderer::turnOffLightLayer(double alpha) { // 4J - TODO
|
||||||
FRAME_PROFILE_SCOPE(Lightmap);
|
FRAME_PROFILE_SCOPE(Lightmap);
|
||||||
#if defined(__linux__)
|
#if defined(__linux__)
|
||||||
if (SharedConstants::TEXTURE_LIGHTING) {
|
if (SharedConstants::TEXTURE_LIGHTING) {
|
||||||
LinuxLogStubLightmapProbe();
|
|
||||||
PlatformRenderer.TextureBindVertex(-1);
|
PlatformRenderer.TextureBindVertex(-1);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
@ -830,7 +829,6 @@ void GameRenderer::turnOnLightLayer(
|
||||||
#if defined(__linux__)
|
#if defined(__linux__)
|
||||||
if (!SharedConstants::TEXTURE_LIGHTING) return;
|
if (!SharedConstants::TEXTURE_LIGHTING) return;
|
||||||
|
|
||||||
LinuxLogStubLightmapProbe();
|
|
||||||
const int textureId = getLightTexture(mc->player->GetXboxPad(), mc->level);
|
const int textureId = getLightTexture(mc->player->GetXboxPad(), mc->level);
|
||||||
|
|
||||||
static int logCount = 0;
|
static int logCount = 0;
|
||||||
|
|
@ -841,7 +839,6 @@ void GameRenderer::turnOnLightLayer(
|
||||||
}
|
}
|
||||||
|
|
||||||
PlatformRenderer.TextureBindVertex(textureId, scaleLight);
|
PlatformRenderer.TextureBindVertex(textureId, scaleLight);
|
||||||
LinuxGLLogLightmapState("turnOnLightLayer", textureId, scaleLight);
|
|
||||||
#else
|
#else
|
||||||
// 4jcraft: update light texture
|
// 4jcraft: update light texture
|
||||||
// todo: check implementation of getLightTexture.
|
// todo: check implementation of getLightTexture.
|
||||||
|
|
|
||||||
|
|
@ -1626,11 +1626,3 @@ void glGetQueryObjectuARB_4J(int id, int pname, IntBuffer* params) {
|
||||||
void glGetFloat(int pname, FloatBuffer* params) {
|
void glGetFloat(int pname, FloatBuffer* params) {
|
||||||
glGetFloat_4J(pname, params);
|
glGetFloat_4J(pname, params);
|
||||||
}
|
}
|
||||||
void LinuxGLLogLightmapState(const char* stage, int textureId,
|
|
||||||
bool scaleLight) {
|
|
||||||
static int logCount = 0;
|
|
||||||
if (logCount >= 16) return;
|
|
||||||
++logCount;
|
|
||||||
fprintf(stderr, "[linux-lightmap] %s tex=%d scale=%d\n", stage, textureId,
|
|
||||||
scaleLight ? 1 : 0);
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/glu.h>
|
#include <GL/glu.h>
|
||||||
|
|
@ -39,8 +40,6 @@ void glEndQueryARB(int);
|
||||||
void glGetQueryObjectuARB(int, int, IntBuffer*);
|
void glGetQueryObjectuARB(int, int, IntBuffer*);
|
||||||
void glReadPixels(int, int, int, int, int, int, ByteBuffer*);
|
void glReadPixels(int, int, int, int, int, int, ByteBuffer*);
|
||||||
|
|
||||||
void LinuxGLLogLightmapState(const char* stage, int textureId, bool scaleLight);
|
|
||||||
void LinuxLogStubLightmapProbe();
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
const int GL_BYTE = 0;
|
const int GL_BYTE = 0;
|
||||||
|
|
@ -289,7 +288,7 @@ public:
|
||||||
class Display {
|
class Display {
|
||||||
public:
|
public:
|
||||||
static bool isActive() { return true; }
|
static bool isActive() { return true; }
|
||||||
static void update();
|
static void update() {}
|
||||||
static void swapBuffers();
|
static void swapBuffers();
|
||||||
static void destroy() {}
|
static void destroy() {}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue